Skip to content

Commit eb10160

Browse files
committed
Upgrade Rails to 4.2.2
1 parent 32f8053 commit eb10160

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ else
55
source 'https://ruby.taobao.org'
66
end
77

8-
gem 'rails', '4.2.1'
8+
gem 'rails', '~> 4.2.2'
99
gem 'sass-rails'
1010
gem 'coffee-rails'
1111
gem 'uglifier'
12-
gem 'jquery-rails'
12+
gem 'jquery-rails', '~> 4.0.4'
1313
gem 'jbuilder'
1414

1515
gem 'actionpack-action_caching', '1.1.1'

Gemfile.lock

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,40 @@ GIT
1818
GEM
1919
remote: https://ruby.taobao.org/
2020
specs:
21-
actionmailer (4.2.1)
22-
actionpack (= 4.2.1)
23-
actionview (= 4.2.1)
24-
activejob (= 4.2.1)
21+
actionmailer (4.2.2)
22+
actionpack (= 4.2.2)
23+
actionview (= 4.2.2)
24+
activejob (= 4.2.2)
2525
mail (~> 2.5, >= 2.5.4)
2626
rails-dom-testing (~> 1.0, >= 1.0.5)
27-
actionpack (4.2.1)
28-
actionview (= 4.2.1)
29-
activesupport (= 4.2.1)
27+
actionpack (4.2.2)
28+
actionview (= 4.2.2)
29+
activesupport (= 4.2.2)
3030
rack (~> 1.6)
3131
rack-test (~> 0.6.2)
3232
rails-dom-testing (~> 1.0, >= 1.0.5)
3333
rails-html-sanitizer (~> 1.0, >= 1.0.1)
3434
actionpack-action_caching (1.1.1)
3535
actionpack (>= 4.0.0, < 5.0)
36-
actionview (4.2.1)
37-
activesupport (= 4.2.1)
36+
actionview (4.2.2)
37+
activesupport (= 4.2.2)
3838
builder (~> 3.1)
3939
erubis (~> 2.7.0)
4040
rails-dom-testing (~> 1.0, >= 1.0.5)
4141
rails-html-sanitizer (~> 1.0, >= 1.0.1)
4242
active_model_serializers (0.9.3)
4343
activemodel (>= 3.2)
44-
activejob (4.2.1)
45-
activesupport (= 4.2.1)
44+
activejob (4.2.2)
45+
activesupport (= 4.2.2)
4646
globalid (>= 0.3.0)
47-
activemodel (4.2.1)
48-
activesupport (= 4.2.1)
47+
activemodel (4.2.2)
48+
activesupport (= 4.2.2)
4949
builder (~> 3.1)
50-
activerecord (4.2.1)
51-
activemodel (= 4.2.1)
52-
activesupport (= 4.2.1)
50+
activerecord (4.2.2)
51+
activemodel (= 4.2.2)
52+
activesupport (= 4.2.2)
5353
arel (~> 6.0)
54-
activesupport (4.2.1)
54+
activesupport (4.2.2)
5555
i18n (~> 0.7)
5656
json (~> 1.7, >= 1.7.7)
5757
minitest (~> 5.1)
@@ -178,19 +178,19 @@ GEM
178178
jbuilder (2.1.3)
179179
activesupport (>= 3.0.0, < 5)
180180
multi_json (~> 1.2)
181-
jquery-rails (4.0.2)
181+
jquery-rails (4.0.4)
182182
rails-dom-testing (~> 1.0)
183183
railties (>= 4.2.0)
184184
thor (>= 0.14, < 2.0)
185-
json (1.8.2)
185+
json (1.8.3)
186186
jwt (0.1.13)
187187
multi_json (>= 1.5)
188188
kgio (2.9.3)
189189
launchy (2.4.2)
190190
addressable (~> 2.3)
191191
letter_opener (1.2.0)
192192
launchy (~> 2.2)
193-
loofah (2.0.1)
193+
loofah (2.0.2)
194194
nokogiri (>= 1.5.9)
195195
mail (2.6.3)
196196
mime-types (>= 1.16, < 3)
@@ -202,11 +202,11 @@ GEM
202202
eventmachine
203203
rack (>= 1.1.3)
204204
redis
205-
mime-types (2.4.3)
205+
mime-types (2.6.1)
206206
mini_magick (3.7.0)
207207
subexec (~> 0.2.1)
208208
mini_portile (0.6.2)
209-
minitest (5.6.1)
209+
minitest (5.7.0)
210210
mongoid (4.0.2)
211211
activemodel (~> 4.0)
212212
moped (~> 2.0.0)
@@ -276,7 +276,7 @@ GEM
276276
rake
277277
puma (2.11.2)
278278
rack (>= 1.1, < 2.0)
279-
rack (1.6.1)
279+
rack (1.6.2)
280280
rack-accept (0.4.5)
281281
rack (>= 0.4)
282282
rack-cors (0.2.9)
@@ -290,16 +290,16 @@ GEM
290290
rack (>= 1.0)
291291
rack-utf8_sanitizer (1.2.2)
292292
rack (~> 1.0)
293-
rails (4.2.1)
294-
actionmailer (= 4.2.1)
295-
actionpack (= 4.2.1)
296-
actionview (= 4.2.1)
297-
activejob (= 4.2.1)
298-
activemodel (= 4.2.1)
299-
activerecord (= 4.2.1)
300-
activesupport (= 4.2.1)
293+
rails (4.2.2)
294+
actionmailer (= 4.2.2)
295+
actionpack (= 4.2.2)
296+
actionview (= 4.2.2)
297+
activejob (= 4.2.2)
298+
activemodel (= 4.2.2)
299+
activerecord (= 4.2.2)
300+
activesupport (= 4.2.2)
301301
bundler (>= 1.3.0, < 2.0)
302-
railties (= 4.2.1)
302+
railties (= 4.2.2)
303303
sprockets-rails
304304
rails-deprecated_sanitizer (1.0.3)
305305
activesupport (>= 4.2.0.alpha)
@@ -315,9 +315,9 @@ GEM
315315
rails-perftest (0.0.5)
316316
rails_autolink (1.1.6)
317317
rails (> 3.1)
318-
railties (4.2.1)
319-
actionpack (= 4.2.1)
320-
activesupport (= 4.2.1)
318+
railties (4.2.2)
319+
actionpack (= 4.2.2)
320+
activesupport (= 4.2.2)
321321
rake (>= 0.8.7)
322322
thor (>= 0.18.1, < 2.0)
323323
rake (10.4.2)
@@ -375,9 +375,9 @@ GEM
375375
rack-protection (~> 1.4)
376376
tilt (~> 1.3, >= 1.3.4)
377377
social-share-button (0.1.5)
378-
sprockets (3.0.1)
378+
sprockets (3.2.0)
379379
rack (~> 1.0)
380-
sprockets-rails (2.2.4)
380+
sprockets-rails (2.3.1)
381381
actionpack (>= 3.0)
382382
activesupport (>= 3.0)
383383
sprockets (>= 2.8, < 4.0)
@@ -434,7 +434,7 @@ DEPENDENCIES
434434
hiredis (~> 0.6.0)
435435
jasmine-rails (~> 0.10.2)
436436
jbuilder
437-
jquery-rails
437+
jquery-rails (~> 4.0.4)
438438
kgio
439439
letter_opener
440440
md_emoji (= 1.0.2)
@@ -458,7 +458,7 @@ DEPENDENCIES
458458
rack-cors
459459
rack-mini-profiler
460460
rack-utf8_sanitizer
461-
rails (= 4.2.1)
461+
rails (~> 4.2.2)
462462
rails-i18n
463463
rails-perftest
464464
rails_autolink (>= 1.1.0)

0 commit comments

Comments
 (0)