Skip to content

Commit 6b4ffa7

Browse files
authored
Merge pull request ruby-china#74 from chloerei/v-5-0-1
更新到 v5.0.1
2 parents 1e5cb09 + c9a073a commit 6b4ffa7

File tree

207 files changed

+27005
-22794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+27005
-22794
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
/output/
66
BASE_PATH
77
.DS_Store
8-
/Gemfile.lock

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

BASE_PATH.example

Lines changed: 0 additions & 1 deletion
This file was deleted.

CC-BY-SA.png

-17.2 KB
Binary file not shown.

CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## Rails 5.0.1 (December 21, 2016) ##
2+
3+
* No changes.
4+
5+
6+
## Rails 5.0.1.rc2 (December 10, 2016) ##
7+
8+
* No changes.
9+
10+
11+
## Rails 5.0.1.rc1 (December 01, 2016) ##
12+
13+
* No changes.
14+
15+
16+
## Rails 5.0.0 (June 30, 2016) ##
17+
18+
* Update example of passing a proc to `:message` option for validating records.
19+
20+
This behavior was recently changed in [Pull Request #24199](https://github.com/rails/rails/pull/24119) to
21+
pass the object being validated as first argument to the `:message` proc,
22+
instead of the key of the field being validated.
23+
24+
*Prathamesh Sonpatki*
25+
26+
* Added new guide: Action Cable Overview.
27+
28+
*David Kuhta*
29+
30+
* Add code of conduct to contributing guide.
31+
32+
*Jon Moss*
33+
34+
* New section in Configuring: Configuring Active Job.
35+
36+
*Eliot Sykes*
37+
38+
* New section in Active Record Association Basics: Single Table Inheritance.
39+
40+
*Andrey Nering*
41+
42+
* New section in Active Record Querying: Understanding The Method Chaining.
43+
44+
*Andrey Nering*
45+
46+
* New section in Configuring: Search Engines Indexing.
47+
48+
*Andrey Nering*
49+
50+
Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/guides/CHANGELOG.md) for previous changes.

CONTRIBUTING.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ruby:2.3
2+
3+
ENV LC_ALL C.UTF-8
4+
ENV LANG en_US.UTF-8
5+
ENV LANGUAGE en_US.UTF-8
6+
7+
RUN mkdir /app
8+
WORKDIR /app
9+
10+
RUN apt-get update && apt-get -y install imagemagick
11+
12+
RUN mkdir /tmp/kindlegen && cd /tmp/kindlegen && \
13+
wget http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v2_9.tar.gz && \
14+
tar xfz kindlegen_linux_2.6_i386_v2_9.tar.gz && \
15+
mv kindlegen /usr/local/bin/
16+
17+
RUN gem install bundler
18+
19+
COPY Gemfile /app
20+
COPY Gemfile.lock /app
21+
RUN bundle install
22+
23+
ENV GUIDES_LANGUAGE=zh-CN
24+
ENV RAILS_VERSION=v5.0.1

Gemfile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1+
# frozen_string_literal: true
12
source 'https://rubygems.org'
23

3-
gem 'activesupport'
4-
5-
gem 'actionpack'
6-
7-
group :doc do
8-
gem 'redcarpet'
9-
end
10-
11-
gem 'nokogiri'
12-
13-
gem 'rake'
14-
4+
gem 'rails', '5.0.1'
5+
gem 'redcarpet'
6+
gem 'kindlerb', '0.1.1'

Gemfile.lock

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
actioncable (5.0.1)
5+
actionpack (= 5.0.1)
6+
nio4r (~> 1.2)
7+
websocket-driver (~> 0.6.1)
8+
actionmailer (5.0.1)
9+
actionpack (= 5.0.1)
10+
actionview (= 5.0.1)
11+
activejob (= 5.0.1)
12+
mail (~> 2.5, >= 2.5.4)
13+
rails-dom-testing (~> 2.0)
14+
actionpack (5.0.1)
15+
actionview (= 5.0.1)
16+
activesupport (= 5.0.1)
17+
rack (~> 2.0)
18+
rack-test (~> 0.6.3)
19+
rails-dom-testing (~> 2.0)
20+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21+
actionview (5.0.1)
22+
activesupport (= 5.0.1)
23+
builder (~> 3.1)
24+
erubis (~> 2.7.0)
25+
rails-dom-testing (~> 2.0)
26+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27+
activejob (5.0.1)
28+
activesupport (= 5.0.1)
29+
globalid (>= 0.3.6)
30+
activemodel (5.0.1)
31+
activesupport (= 5.0.1)
32+
activerecord (5.0.1)
33+
activemodel (= 5.0.1)
34+
activesupport (= 5.0.1)
35+
arel (~> 7.0)
36+
activesupport (5.0.1)
37+
concurrent-ruby (~> 1.0, >= 1.0.2)
38+
i18n (~> 0.7)
39+
minitest (~> 5.1)
40+
tzinfo (~> 1.1)
41+
arel (7.1.4)
42+
builder (3.2.3)
43+
concurrent-ruby (1.0.4)
44+
erubis (2.7.0)
45+
globalid (0.3.7)
46+
activesupport (>= 4.1.0)
47+
i18n (0.8.1)
48+
kindlerb (0.1.1)
49+
mustache
50+
nokogiri
51+
loofah (2.0.3)
52+
nokogiri (>= 1.5.9)
53+
mail (2.6.4)
54+
mime-types (>= 1.16, < 4)
55+
method_source (0.8.2)
56+
mime-types (3.1)
57+
mime-types-data (~> 3.2015)
58+
mime-types-data (3.2016.0521)
59+
mini_portile2 (2.1.0)
60+
minitest (5.10.1)
61+
mustache (1.0.3)
62+
nio4r (1.2.1)
63+
nokogiri (1.7.0.1)
64+
mini_portile2 (~> 2.1.0)
65+
rack (2.0.1)
66+
rack-test (0.6.3)
67+
rack (>= 1.0)
68+
rails (5.0.1)
69+
actioncable (= 5.0.1)
70+
actionmailer (= 5.0.1)
71+
actionpack (= 5.0.1)
72+
actionview (= 5.0.1)
73+
activejob (= 5.0.1)
74+
activemodel (= 5.0.1)
75+
activerecord (= 5.0.1)
76+
activesupport (= 5.0.1)
77+
bundler (>= 1.3.0, < 2.0)
78+
railties (= 5.0.1)
79+
sprockets-rails (>= 2.0.0)
80+
rails-dom-testing (2.0.2)
81+
activesupport (>= 4.2.0, < 6.0)
82+
nokogiri (~> 1.6)
83+
rails-html-sanitizer (1.0.3)
84+
loofah (~> 2.0)
85+
railties (5.0.1)
86+
actionpack (= 5.0.1)
87+
activesupport (= 5.0.1)
88+
method_source
89+
rake (>= 0.8.7)
90+
thor (>= 0.18.1, < 2.0)
91+
rake (12.0.0)
92+
redcarpet (3.4.0)
93+
sprockets (3.7.1)
94+
concurrent-ruby (~> 1.0)
95+
rack (> 1, < 3)
96+
sprockets-rails (3.2.0)
97+
actionpack (>= 4.0)
98+
activesupport (>= 4.0)
99+
sprockets (>= 3.0.0)
100+
thor (0.19.4)
101+
thread_safe (0.3.6)
102+
tzinfo (1.2.2)
103+
thread_safe (~> 0.1)
104+
websocket-driver (0.6.5)
105+
websocket-extensions (>= 0.1.0)
106+
websocket-extensions (0.1.2)
107+
108+
PLATFORMS
109+
ruby
110+
111+
DEPENDENCIES
112+
kindlerb (= 0.1.1)
113+
rails (= 5.0.1)
114+
redcarpet
115+
116+
BUNDLED WITH
117+
1.14.5

0 commit comments

Comments
 (0)