Skip to content

Commit c2fdf64

Browse files
committed
bump rails version
1 parent 2ee836f commit c2fdf64

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ruby '2.2.2'
22
source 'https://rubygems.org'
33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '4.2.4'
5+
gem 'rails', '4.2.5'
66
# Use postgresql as the database for Active Record
77
gem 'pg'
88
gem 'sass'

Gemfile.lock

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ GIT
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actionmailer (4.2.4)
11-
actionpack (= 4.2.4)
12-
actionview (= 4.2.4)
13-
activejob (= 4.2.4)
10+
actionmailer (4.2.5)
11+
actionpack (= 4.2.5)
12+
actionview (= 4.2.5)
13+
activejob (= 4.2.5)
1414
mail (~> 2.5, >= 2.5.4)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
actionpack (4.2.4)
17-
actionview (= 4.2.4)
18-
activesupport (= 4.2.4)
16+
actionpack (4.2.5)
17+
actionview (= 4.2.5)
18+
activesupport (= 4.2.5)
1919
rack (~> 1.6)
2020
rack-test (~> 0.6.2)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
actionview (4.2.4)
24-
activesupport (= 4.2.4)
23+
actionview (4.2.5)
24+
activesupport (= 4.2.5)
2525
builder (~> 3.1)
2626
erubis (~> 2.7.0)
2727
rails-dom-testing (~> 1.0, >= 1.0.5)
2828
rails-html-sanitizer (~> 1.0, >= 1.0.2)
2929
active_model_serializers (0.9.3)
3030
activemodel (>= 3.2)
31-
activejob (4.2.4)
32-
activesupport (= 4.2.4)
31+
activejob (4.2.5)
32+
activesupport (= 4.2.5)
3333
globalid (>= 0.3.0)
34-
activemodel (4.2.4)
35-
activesupport (= 4.2.4)
34+
activemodel (4.2.5)
35+
activesupport (= 4.2.5)
3636
builder (~> 3.1)
37-
activerecord (4.2.4)
38-
activemodel (= 4.2.4)
39-
activesupport (= 4.2.4)
37+
activerecord (4.2.5)
38+
activemodel (= 4.2.5)
39+
activesupport (= 4.2.5)
4040
arel (~> 6.0)
41-
activesupport (4.2.4)
41+
activesupport (4.2.5)
4242
i18n (~> 0.7)
4343
json (~> 1.7, >= 1.7.7)
4444
minitest (~> 5.1)
@@ -70,7 +70,7 @@ GEM
7070
coffee-script-source
7171
execjs
7272
coffee-script-source (1.9.1.1)
73-
concurrent-ruby (1.0.0)
73+
concurrent-ruby (1.0.1)
7474
database_cleaner (1.5.0)
7575
descendants_tracker (0.0.4)
7676
thread_safe (~> 0.3, >= 0.3.1)
@@ -173,7 +173,7 @@ GEM
173173
mail (2.6.3)
174174
mime-types (>= 1.16, < 3)
175175
method_source (0.8.2)
176-
mime-types (2.99)
176+
mime-types (2.99.1)
177177
mini_portile2 (2.0.0)
178178
minitest (5.8.4)
179179
multi_json (1.11.2)
@@ -215,16 +215,16 @@ GEM
215215
rack (>= 1.0.0)
216216
rack-test (0.6.3)
217217
rack (>= 1.0)
218-
rails (4.2.4)
219-
actionmailer (= 4.2.4)
220-
actionpack (= 4.2.4)
221-
actionview (= 4.2.4)
222-
activejob (= 4.2.4)
223-
activemodel (= 4.2.4)
224-
activerecord (= 4.2.4)
225-
activesupport (= 4.2.4)
218+
rails (4.2.5)
219+
actionmailer (= 4.2.5)
220+
actionpack (= 4.2.5)
221+
actionview (= 4.2.5)
222+
activejob (= 4.2.5)
223+
activemodel (= 4.2.5)
224+
activerecord (= 4.2.5)
225+
activesupport (= 4.2.5)
226226
bundler (>= 1.3.0, < 2.0)
227-
railties (= 4.2.4)
227+
railties (= 4.2.5)
228228
sprockets-rails
229229
rails-deprecated_sanitizer (1.0.3)
230230
activesupport (>= 4.2.0.alpha)
@@ -234,9 +234,9 @@ GEM
234234
rails-deprecated_sanitizer (>= 1.0.1)
235235
rails-html-sanitizer (1.0.3)
236236
loofah (~> 2.0)
237-
railties (4.2.4)
238-
actionpack (= 4.2.4)
239-
activesupport (= 4.2.4)
237+
railties (4.2.5)
238+
actionpack (= 4.2.5)
239+
activesupport (= 4.2.5)
240240
rake (>= 0.8.7)
241241
thor (>= 0.18.1, < 2.0)
242242
rake (10.5.0)
@@ -283,7 +283,7 @@ GEM
283283
sprockets (3.5.2)
284284
concurrent-ruby (~> 1.0)
285285
rack (> 1, < 3)
286-
sprockets-rails (3.0.1)
286+
sprockets-rails (3.0.3)
287287
actionpack (>= 4.0)
288288
activesupport (>= 4.0)
289289
sprockets (>= 3.0.0)
@@ -344,7 +344,7 @@ DEPENDENCIES
344344
pry
345345
puma
346346
rack-cors
347-
rails (= 4.2.4)
347+
rails (= 4.2.5)
348348
rerun
349349
rspec (~> 3.3.0)
350350
rspec-rails

0 commit comments

Comments
 (0)