Skip to content

Commit 522d30a

Browse files
JuanitoFatastiseheaini
authored andcommitted
Update Rails to 4.1.1 & bcrypt-ruby has been renamed to bcrypt.
* `bcrypt-ruby` now `bcrypt` Ref. rails/rails@53f1ab5 and bcrypt-ruby/bcrypt-ruby#86.
1 parent 768156d commit 522d30a

3 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎Gemfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
#source 'https://ruby.taobao.org/'
33

4-
gem 'rails', '4.1.0'
4+
gem 'rails', '4.1.1'
55

66
# Use postgresql as the database for Active Record
77
gem 'pg'
@@ -46,8 +46,10 @@ gem 'redcarpet', '~> 3.0.0'
4646
# Code highlight
4747
gem 'rouge', '~> 1.3.1'
4848

49-
# Use ActiveModel has_secure_password
50-
gem 'bcrypt-ruby', '~> 3.1.2'
49+
# require: false so bcrypt is loaded only when has_secure_password is used.
50+
# This is to avoid ActiveModel (and by extension the entire framework)
51+
# being dependent on a binary library.
52+
gem 'bcrypt', '~> 3.1.7', require: false
5153

5254
# Paignator
5355
gem 'kaminari', '~> 0.15.1'

‎Gemfile.lock‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actionmailer (4.1.0)
13-
actionpack (= 4.1.0)
14-
actionview (= 4.1.0)
12+
actionmailer (4.1.1)
13+
actionpack (= 4.1.1)
14+
actionview (= 4.1.1)
1515
mail (~> 2.5.4)
16-
actionpack (4.1.0)
17-
actionview (= 4.1.0)
18-
activesupport (= 4.1.0)
16+
actionpack (4.1.1)
17+
actionview (= 4.1.1)
18+
activesupport (= 4.1.1)
1919
rack (~> 1.5.2)
2020
rack-test (~> 0.6.2)
21-
actionview (4.1.0)
22-
activesupport (= 4.1.0)
21+
actionview (4.1.1)
22+
activesupport (= 4.1.1)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
25-
activemodel (4.1.0)
26-
activesupport (= 4.1.0)
25+
activemodel (4.1.1)
26+
activesupport (= 4.1.1)
2727
builder (~> 3.1)
28-
activerecord (4.1.0)
29-
activemodel (= 4.1.0)
30-
activesupport (= 4.1.0)
28+
activerecord (4.1.1)
29+
activemodel (= 4.1.1)
30+
activesupport (= 4.1.1)
3131
arel (~> 5.0.0)
32-
activesupport (4.1.0)
32+
activesupport (4.1.1)
3333
i18n (~> 0.6, >= 0.6.9)
3434
json (~> 1.7, >= 1.7.7)
3535
minitest (~> 5.1)
3636
thread_safe (~> 0.1)
3737
tzinfo (~> 1.1)
38-
arel (5.0.0)
39-
bcrypt-ruby (3.1.2)
38+
arel (5.0.1.20140414130214)
39+
bcrypt (3.1.7)
4040
bootstrap-sass (3.1.0.1)
4141
sass (~> 3.2)
4242
builder (3.2.2)
@@ -132,9 +132,9 @@ GEM
132132
mini_magick (3.7.0)
133133
subexec (~> 0.2.1)
134134
mini_portile (0.5.2)
135-
minitest (5.3.2)
135+
minitest (5.3.4)
136136
mono_logger (1.1.0)
137-
multi_json (1.9.2)
137+
multi_json (1.10.0)
138138
net-scp (1.1.2)
139139
net-ssh (>= 2.6.5)
140140
net-sftp (2.1.2)
@@ -159,25 +159,25 @@ GEM
159159
rack
160160
rack-test (0.6.2)
161161
rack (>= 1.0)
162-
rails (4.1.0)
163-
actionmailer (= 4.1.0)
164-
actionpack (= 4.1.0)
165-
actionview (= 4.1.0)
166-
activemodel (= 4.1.0)
167-
activerecord (= 4.1.0)
168-
activesupport (= 4.1.0)
162+
rails (4.1.1)
163+
actionmailer (= 4.1.1)
164+
actionpack (= 4.1.1)
165+
actionview (= 4.1.1)
166+
activemodel (= 4.1.1)
167+
activerecord (= 4.1.1)
168+
activesupport (= 4.1.1)
169169
bundler (>= 1.3.0, < 2.0)
170-
railties (= 4.1.0)
170+
railties (= 4.1.1)
171171
sprockets-rails (~> 2.0)
172172
rails-i18n (4.0.1)
173173
i18n (~> 0.6)
174174
rails (~> 4.0)
175-
railties (4.1.0)
176-
actionpack (= 4.1.0)
177-
activesupport (= 4.1.0)
175+
railties (4.1.1)
176+
actionpack (= 4.1.1)
177+
activesupport (= 4.1.1)
178178
rake (>= 0.8.7)
179179
thor (>= 0.18.1, < 2.0)
180-
rake (10.2.2)
180+
rake (10.3.2)
181181
rb-fsevent (0.9.4)
182182
rb-inotify (0.9.3)
183183
ffi (>= 0.5.0)
@@ -214,7 +214,7 @@ GEM
214214
multi_json (~> 1.0)
215215
rack (~> 1.0)
216216
tilt (~> 1.1, != 1.3.0)
217-
sprockets-rails (2.1.1)
217+
sprockets-rails (2.1.3)
218218
actionpack (>= 3.0)
219219
activesupport (>= 3.0)
220220
sprockets (~> 2.8)
@@ -244,7 +244,7 @@ PLATFORMS
244244
ruby
245245

246246
DEPENDENCIES
247-
bcrypt-ruby (~> 3.1.2)
247+
bcrypt (~> 3.1.7)
248248
bootstrap-sass (~> 3.1.0)
249249
capistrano (= 2.15.4)
250250
capistrano-rbenv (= 1.0.5)
@@ -265,7 +265,7 @@ DEPENDENCIES
265265
pg
266266
puma
267267
rack-livereload
268-
rails (= 4.1.0)
268+
rails (= 4.1.1)
269269
rails-i18n (~> 4.0.1)
270270
redcarpet (~> 3.0.0)
271271
redis (~> 3.0.7)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It's good for:
1111

1212
## Build with
1313

14-
- Ruby 2.1 and Rails 4.1.0-beta1(Will be update after stable release)
14+
- Ruby 2.1 and Rails 4.1.1
1515
- Postgresql 9.1+ for databsae
1616
- elasticsearch 1.0+ for full text searching
1717
- Redis for backgound jobs

0 commit comments

Comments
 (0)