Skip to content
This repository was archived by the owner on May 12, 2018. It is now read-only.

Commit e754e9d

Browse files
committed
Update rails to 4.0.10
Signed-off-by: Dmitriy Zaporozhets <[email protected]>
1 parent 35ab3d8 commit e754e9d

File tree

2 files changed

+31
-36
lines changed

2 files changed

+31
-36
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def linux_only(require_as)
88
RUBY_PLATFORM.include?('linux') && require_as
99
end
1010

11-
gem 'rails', '4.0.5'
11+
gem 'rails', '4.0.10'
1212
gem 'protected_attributes'
1313
gem 'actionpack-page_caching'
1414
gem 'actionpack-action_caching'

Gemfile.lock

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.5)
5-
actionpack (= 4.0.5)
6-
mail (~> 2.5.4)
7-
actionpack (4.0.5)
8-
activesupport (= 4.0.5)
4+
actionmailer (4.0.10)
5+
actionpack (= 4.0.10)
6+
mail (~> 2.5, >= 2.5.4)
7+
actionpack (4.0.10)
8+
activesupport (= 4.0.10)
99
builder (~> 3.1.0)
1010
erubis (~> 2.7.0)
1111
rack (~> 1.5.2)
@@ -14,20 +14,20 @@ GEM
1414
actionpack (>= 4.0.0, < 5.0)
1515
actionpack-page_caching (1.0.2)
1616
actionpack (>= 4.0.0, < 5)
17-
activemodel (4.0.5)
18-
activesupport (= 4.0.5)
17+
activemodel (4.0.10)
18+
activesupport (= 4.0.10)
1919
builder (~> 3.1.0)
20-
activerecord (4.0.5)
21-
activemodel (= 4.0.5)
20+
activerecord (4.0.10)
21+
activemodel (= 4.0.10)
2222
activerecord-deprecated_finders (~> 1.0.2)
23-
activesupport (= 4.0.5)
23+
activesupport (= 4.0.10)
2424
arel (~> 4.0.0)
2525
activerecord-deprecated_finders (1.0.3)
2626
activerecord-session_store (0.1.0)
2727
actionpack (>= 4.0.0, < 5)
2828
activerecord (>= 4.0.0, < 5)
2929
railties (>= 4.0.0, < 5)
30-
activesupport (4.0.5)
30+
activesupport (4.0.10)
3131
i18n (~> 0.6, >= 0.6.9)
3232
minitest (~> 4.2)
3333
multi_json (~> 1.3)
@@ -130,7 +130,7 @@ GEM
130130
httparty (0.11.0)
131131
multi_json (~> 1.0)
132132
multi_xml (>= 0.5.2)
133-
i18n (0.6.9)
133+
i18n (0.6.11)
134134
ice_nine (0.11.0)
135135
jquery-rails (3.0.4)
136136
railties (>= 3.0, < 5.0)
@@ -153,14 +153,13 @@ GEM
153153
rb-fsevent (>= 0.9.3)
154154
rb-inotify (>= 0.9)
155155
lumberjack (1.0.4)
156-
mail (2.5.4)
157-
mime-types (~> 1.16)
158-
treetop (~> 1.4.8)
156+
mail (2.6.1)
157+
mime-types (>= 1.16, < 3)
159158
method_source (0.8.2)
160-
mime-types (1.25.1)
159+
mime-types (2.4.1)
161160
mini_portile (0.5.2)
162161
minitest (4.3.2)
163-
multi_json (1.10.0)
162+
multi_json (1.10.1)
164163
multi_xml (0.5.5)
165164
mysql2 (0.3.14)
166165
nokogiri (1.6.0)
@@ -172,7 +171,6 @@ GEM
172171
cliver (~> 0.2.1)
173172
multi_json (~> 1.0)
174173
websocket-driver (>= 0.2.0)
175-
polyglot (0.3.4)
176174
protected_attributes (1.0.5)
177175
activemodel (>= 4.0.1, < 5.0)
178176
pry (0.9.12.4)
@@ -190,21 +188,21 @@ GEM
190188
rack
191189
rack-test (0.6.2)
192190
rack (>= 1.0)
193-
rails (4.0.5)
194-
actionmailer (= 4.0.5)
195-
actionpack (= 4.0.5)
196-
activerecord (= 4.0.5)
197-
activesupport (= 4.0.5)
191+
rails (4.0.10)
192+
actionmailer (= 4.0.10)
193+
actionpack (= 4.0.10)
194+
activerecord (= 4.0.10)
195+
activesupport (= 4.0.10)
198196
bundler (>= 1.3.0, < 2.0)
199-
railties (= 4.0.5)
200-
sprockets-rails (~> 2.0.0)
201-
railties (4.0.5)
202-
actionpack (= 4.0.5)
203-
activesupport (= 4.0.5)
197+
railties (= 4.0.10)
198+
sprockets-rails (~> 2.0)
199+
railties (4.0.10)
200+
actionpack (= 4.0.10)
201+
activesupport (= 4.0.10)
204202
rake (>= 0.8.7)
205203
thor (>= 0.18.1, < 2.0)
206204
raindrops (0.12.0)
207-
rake (10.3.1)
205+
rake (10.3.2)
208206
rb-fsevent (0.9.3)
209207
rb-inotify (0.9.2)
210208
ffi (>= 0.5.0)
@@ -263,7 +261,7 @@ GEM
263261
multi_json (~> 1.0)
264262
rack (~> 1.0)
265263
tilt (~> 1.1, != 1.3.0)
266-
sprockets-rails (2.0.1)
264+
sprockets-rails (2.1.4)
267265
actionpack (>= 3.0)
268266
activesupport (>= 3.0)
269267
sprockets (~> 2.8)
@@ -280,12 +278,9 @@ GEM
280278
tilt (1.4.1)
281279
timers (1.1.0)
282280
tins (0.13.1)
283-
treetop (1.4.15)
284-
polyglot
285-
polyglot (>= 0.3.1)
286281
turbolinks (2.0.0)
287282
coffee-rails
288-
tzinfo (0.3.39)
283+
tzinfo (0.3.41)
289284
uglifier (2.3.2)
290285
execjs (>= 0.3.0)
291286
json (>= 1.8.0)
@@ -344,7 +339,7 @@ DEPENDENCIES
344339
protected_attributes
345340
pry
346341
quiet_assets
347-
rails (= 4.0.5)
342+
rails (= 4.0.10)
348343
rake
349344
rb-fsevent
350345
rb-inotify

0 commit comments

Comments
 (0)