Download as
Browse Code »

Commit a52bd23ad81d28615af4dc173065977fee018df2

Authored by Stephen Crosby
2 parents fdd08978 9eb6d00c
Exists in master and in 1 other branch production

Merge pull request #901 from rud/security/rails-update 

Security update: Rails 4.1.11 release
Showing 2 changed files with 43 additions and 44 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -RAILS_VERSION = '~> 4.1.8' 3 +RAILS_VERSION = '~> 4.1.11'
4 4
5 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION'] 5 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']
6 6
1 GEM 1 GEM
2 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
3 specs: 3 specs:
4 - actionmailer (4.1.8)  
5 - actionpack (= 4.1.8)  
6 - actionview (= 4.1.8) 4 + actionmailer (4.1.11)
  5 + actionpack (= 4.1.11)
  6 + actionview (= 4.1.11)
7 mail (~> 2.5, >= 2.5.4) 7 mail (~> 2.5, >= 2.5.4)
8 actionmailer_inline_css (1.5.3) 8 actionmailer_inline_css (1.5.3)
9 actionmailer (>= 3.0.0) 9 actionmailer (>= 3.0.0)
10 nokogiri (>= 1.4.4) 10 nokogiri (>= 1.4.4)
11 premailer (>= 1.7.1) 11 premailer (>= 1.7.1)
12 - actionpack (4.1.8)  
13 - actionview (= 4.1.8)  
14 - activesupport (= 4.1.8) 12 + actionpack (4.1.11)
  13 + actionview (= 4.1.11)
  14 + activesupport (= 4.1.11)
15 rack (~> 1.5.2) 15 rack (~> 1.5.2)
16 rack-test (~> 0.6.2) 16 rack-test (~> 0.6.2)
17 - actionview (4.1.8)  
18 - activesupport (= 4.1.8) 17 + actionview (4.1.11)
  18 + activesupport (= 4.1.11)
19 builder (~> 3.1) 19 builder (~> 3.1)
20 erubis (~> 2.7.0) 20 erubis (~> 2.7.0)
21 - activemodel (4.1.8)  
22 - activesupport (= 4.1.8) 21 + activemodel (4.1.11)
  22 + activesupport (= 4.1.11)
23 builder (~> 3.1) 23 builder (~> 3.1)
24 - activerecord (4.1.8)  
25 - activemodel (= 4.1.8)  
26 - activesupport (= 4.1.8) 24 + activerecord (4.1.11)
  25 + activemodel (= 4.1.11)
  26 + activesupport (= 4.1.11)
27 arel (~> 5.0.0) 27 arel (~> 5.0.0)
28 - activesupport (4.1.8) 28 + activesupport (4.1.11)
29 i18n (~> 0.6, >= 0.6.9) 29 i18n (~> 0.6, >= 0.6.9)
30 json (~> 1.7, >= 1.7.7) 30 json (~> 1.7, >= 1.7.7)
31 minitest (~> 5.1) 31 minitest (~> 5.1)
@@ -129,7 +129,6 @@ GEM @@ -129,7 +129,6 @@ GEM
129 haml (4.0.3) 129 haml (4.0.3)
130 tilt 130 tilt
131 hashie (2.0.5) 131 hashie (2.0.5)
132 - hike (1.2.3)  
133 hipchat (1.5.1) 132 hipchat (1.5.1)
134 httparty 133 httparty
135 mimemagic 134 mimemagic
@@ -148,8 +147,8 @@ GEM @@ -148,8 +147,8 @@ GEM
148 jquery-rails (2.1.4) 147 jquery-rails (2.1.4)
149 railties (>= 3.0, < 5.0) 148 railties (>= 3.0, < 5.0)
150 thor (>= 0.14, < 2.0) 149 thor (>= 0.14, < 2.0)
151 - json (1.8.2)  
152 - json (1.8.2-java) 150 + json (1.8.3)
  151 + json (1.8.3-java)
153 jwt (0.1.8) 152 jwt (0.1.8)
154 multi_json (>= 1.5) 153 multi_json (>= 1.5)
155 kaminari (0.14.1) 154 kaminari (0.14.1)
@@ -172,7 +171,7 @@ GEM @@ -172,7 +171,7 @@ GEM
172 mime-types (1.25.1) 171 mime-types (1.25.1)
173 mimemagic (0.3.0) 172 mimemagic (0.3.0)
174 mini_portile (0.6.2) 173 mini_portile (0.6.2)
175 - minitest (5.5.1) 174 + minitest (5.7.0)
176 mongoid (4.0.2) 175 mongoid (4.0.2)
177 activemodel (~> 4.0) 176 activemodel (~> 4.0)
178 moped (~> 2.0.0) 177 moped (~> 2.0.0)
@@ -191,7 +190,7 @@ GEM @@ -191,7 +190,7 @@ GEM
191 bson (~> 2.2) 190 bson (~> 2.2)
192 connection_pool (~> 2.0) 191 connection_pool (~> 2.0)
193 optionable (~> 0.2.0) 192 optionable (~> 0.2.0)
194 - multi_json (1.10.1) 193 + multi_json (1.11.1)
195 multi_xml (0.5.5) 194 multi_xml (0.5.5)
196 multipart-post (2.0.0) 195 multipart-post (2.0.0)
197 net-scp (1.2.1) 196 net-scp (1.2.1)
@@ -247,7 +246,7 @@ GEM @@ -247,7 +246,7 @@ GEM
247 pry (>= 0.9.10) 246 pry (>= 0.9.10)
248 quiet_assets (1.0.2) 247 quiet_assets (1.0.2)
249 railties (>= 3.1, < 5.0) 248 railties (>= 3.1, < 5.0)
250 - rack (1.5.2) 249 + rack (1.5.4)
251 rack-contrib (1.1.0) 250 rack-contrib (1.1.0)
252 rack (>= 0.9.1) 251 rack (>= 0.9.1)
253 rack-ssl (1.4.0) 252 rack-ssl (1.4.0)
@@ -255,15 +254,15 @@ GEM @@ -255,15 +254,15 @@ GEM
255 rack-ssl-enforcer (0.2.6) 254 rack-ssl-enforcer (0.2.6)
256 rack-test (0.6.3) 255 rack-test (0.6.3)
257 rack (>= 1.0) 256 rack (>= 1.0)
258 - rails (4.1.8)  
259 - actionmailer (= 4.1.8)  
260 - actionpack (= 4.1.8)  
261 - actionview (= 4.1.8)  
262 - activemodel (= 4.1.8)  
263 - activerecord (= 4.1.8)  
264 - activesupport (= 4.1.8) 257 + rails (4.1.11)
  258 + actionmailer (= 4.1.11)
  259 + actionpack (= 4.1.11)
  260 + actionview (= 4.1.11)
  261 + activemodel (= 4.1.11)
  262 + activerecord (= 4.1.11)
  263 + activesupport (= 4.1.11)
265 bundler (>= 1.3.0, < 2.0) 264 bundler (>= 1.3.0, < 2.0)
266 - railties (= 4.1.8) 265 + railties (= 4.1.11)
267 sprockets-rails (~> 2.0) 266 sprockets-rails (~> 2.0)
268 rails_12factor (0.0.3) 267 rails_12factor (0.0.3)
269 rails_serve_static_assets 268 rails_serve_static_assets
@@ -272,9 +271,9 @@ GEM @@ -272,9 +271,9 @@ GEM
272 rails (> 3.1) 271 rails (> 3.1)
273 rails_serve_static_assets (0.0.4) 272 rails_serve_static_assets (0.0.4)
274 rails_stdout_logging (0.0.3) 273 rails_stdout_logging (0.0.3)
275 - railties (4.1.8)  
276 - actionpack (= 4.1.8)  
277 - activesupport (= 4.1.8) 274 + railties (4.1.11)
  275 + actionpack (= 4.1.11)
  276 + activesupport (= 4.1.11)
278 rake (>= 0.8.7) 277 rake (>= 0.8.7)
279 thor (>= 0.18.1, < 2.0) 278 thor (>= 0.18.1, < 2.0)
280 raindrops (0.13.0) 279 raindrops (0.13.0)
@@ -319,8 +318,8 @@ GEM @@ -319,8 +318,8 @@ GEM
319 rushover (0.3.0) 318 rushover (0.3.0)
320 json 319 json
321 rest-client 320 rest-client
322 - sass (3.4.9)  
323 - sass-rails (5.0.1) 321 + sass (3.4.14)
  322 + sass-rails (5.0.3)
324 railties (>= 4.0.0, < 5.0) 323 railties (>= 4.0.0, < 5.0)
325 sass (~> 3.1) 324 sass (~> 3.1)
326 sprockets (>= 2.8, < 4.0) 325 sprockets (>= 2.8, < 4.0)
@@ -336,12 +335,9 @@ GEM @@ -336,12 +335,9 @@ GEM
336 slop (3.4.6) 335 slop (3.4.6)
337 spoon (0.0.4) 336 spoon (0.0.4)
338 ffi 337 ffi
339 - sprockets (2.12.3)  
340 - hike (~> 1.2)  
341 - multi_json (~> 1.0) 338 + sprockets (3.2.0)
342 rack (~> 1.0) 339 rack (~> 1.0)
343 - tilt (~> 1.1, != 1.3.0)  
344 - sprockets-rails (2.2.2) 340 + sprockets-rails (2.3.1)
345 actionpack (>= 3.0) 341 actionpack (>= 3.0)
346 activesupport (>= 3.0) 342 activesupport (>= 3.0)
347 sprockets (>= 2.8, < 4.0) 343 sprockets (>= 2.8, < 4.0)
@@ -357,8 +353,8 @@ GEM @@ -357,8 +353,8 @@ GEM
357 libv8 (~> 3.16.14.0) 353 libv8 (~> 3.16.14.0)
358 ref 354 ref
359 thor (0.19.1) 355 thor (0.19.1)
360 - thread_safe (0.3.4)  
361 - thread_safe (0.3.4-java) 356 + thread_safe (0.3.5)
  357 + thread_safe (0.3.5-java)
362 tilt (1.4.1) 358 tilt (1.4.1)
363 timecop (0.6.3) 359 timecop (0.6.3)
364 tins (0.12.0) 360 tins (0.12.0)
@@ -390,9 +386,9 @@ PLATFORMS @@ -390,9 +386,9 @@ PLATFORMS
390 ruby 386 ruby
391 387
392 DEPENDENCIES 388 DEPENDENCIES
393 - actionmailer (~> 4.1.8) 389 + actionmailer (~> 4.1.11)
394 actionmailer_inline_css 390 actionmailer_inline_css
395 - actionpack (~> 4.1.8) 391 + actionpack (~> 4.1.11)
396 airbrake 392 airbrake
397 better_errors 393 better_errors
398 binding_of_caller 394 binding_of_caller
@@ -439,7 +435,7 @@ DEPENDENCIES @@ -439,7 +435,7 @@ DEPENDENCIES
439 rack-ssl-enforcer 435 rack-ssl-enforcer
440 rails_12factor 436 rails_12factor
441 rails_autolink 437 rails_autolink
442 - railties (~> 4.1.8) 438 + railties (~> 4.1.11)
443 ri_cal 439 ri_cal
444 rspec 440 rspec
445 rspec-activemodel-mocks 441 rspec-activemodel-mocks
@@ -456,3 +452,6 @@ DEPENDENCIES @@ -456,3 +452,6 @@ DEPENDENCIES
456 useragent 452 useragent
457 xmpp4r 453 xmpp4r
458 yajl-ruby 454 yajl-ruby
  455 +
  456 +BUNDLED WITH
  457 + 1.10.3