Download as
Browse Code »

Commit 79a0f0a1333bbb2e4ca0aaf3680e290caeba1d95

Authored by Stephen Crosby
2 parents 3e1d0657 e204efc0
Exists in master

Merge pull request #1036 from felixbuenemann/security-updates 

Security Updates for Dependencies
Showing 2 changed files with 62 additions and 58 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -RAILS_VERSION = '~> 4.2.0' 3 +RAILS_VERSION = '~> 4.2.5.1'
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
@@ -18,7 +18,7 @@ gem 'railties', RAILS_VERSION @@ -18,7 +18,7 @@ gem 'railties', RAILS_VERSION
18 18
19 gem 'actionmailer_inline_css' 19 gem 'actionmailer_inline_css'
20 gem 'decent_exposure' 20 gem 'decent_exposure'
21 -gem 'devise' 21 +gem 'devise', '~> 3.5.5'
22 gem 'dotenv-rails' 22 gem 'dotenv-rails'
23 gem 'draper' 23 gem 'draper'
24 gem 'errbit_plugin' 24 gem 'errbit_plugin'
@@ -26,7 +26,7 @@ gem 'errbit_github_plugin' @@ -26,7 +26,7 @@ gem 'errbit_github_plugin'
26 gem 'font-awesome-rails' 26 gem 'font-awesome-rails'
27 gem 'haml' 27 gem 'haml'
28 gem 'htmlentities' 28 gem 'htmlentities'
29 -gem 'kaminari', '>= 0.14.1' 29 +gem 'kaminari', '>= 0.16.3'
30 gem 'mongoid', '5.0.2' 30 gem 'mongoid', '5.0.2'
31 gem 'mongoid_rails_migrations' 31 gem 'mongoid_rails_migrations'
32 gem 'rack-ssl', require: 'rack/ssl' # force SSL 32 gem 'rack-ssl', require: 'rack/ssl' # force SSL
@@ -64,7 +64,7 @@ gem 'yajl-ruby', platform: 'ruby' @@ -64,7 +64,7 @@ gem 'yajl-ruby', platform: 'ruby'
64 gem 'json', platform: 'jruby' 64 gem 'json', platform: 'jruby'
65 65
66 group :development, :test do 66 group :development, :test do
67 - gem 'airbrake', require: false 67 + gem 'airbrake', '~> 4.3.5', require: false
68 gem 'pry-rails' 68 gem 'pry-rails'
69 gem 'pry-byebug', platforms: [:mri] 69 gem 'pry-byebug', platforms: [:mri]
70 gem 'quiet_assets' 70 gem 'quiet_assets'
1 GEM 1 GEM
2 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
3 specs: 3 specs:
4 - actionmailer (4.2.3)  
5 - actionpack (= 4.2.3)  
6 - actionview (= 4.2.3)  
7 - activejob (= 4.2.3) 4 + actionmailer (4.2.5.1)
  5 + actionpack (= 4.2.5.1)
  6 + actionview (= 4.2.5.1)
  7 + activejob (= 4.2.5.1)
8 mail (~> 2.5, >= 2.5.4) 8 mail (~> 2.5, >= 2.5.4)
9 rails-dom-testing (~> 1.0, >= 1.0.5) 9 rails-dom-testing (~> 1.0, >= 1.0.5)
10 actionmailer_inline_css (1.5.3) 10 actionmailer_inline_css (1.5.3)
11 actionmailer (>= 3.0.0) 11 actionmailer (>= 3.0.0)
12 nokogiri (>= 1.4.4) 12 nokogiri (>= 1.4.4)
13 premailer (>= 1.7.1) 13 premailer (>= 1.7.1)
14 - actionpack (4.2.3)  
15 - actionview (= 4.2.3)  
16 - activesupport (= 4.2.3) 14 + actionpack (4.2.5.1)
  15 + actionview (= 4.2.5.1)
  16 + activesupport (= 4.2.5.1)
17 rack (~> 1.6) 17 rack (~> 1.6)
18 rack-test (~> 0.6.2) 18 rack-test (~> 0.6.2)
19 rails-dom-testing (~> 1.0, >= 1.0.5) 19 rails-dom-testing (~> 1.0, >= 1.0.5)
20 rails-html-sanitizer (~> 1.0, >= 1.0.2) 20 rails-html-sanitizer (~> 1.0, >= 1.0.2)
21 - actionview (4.2.3)  
22 - activesupport (= 4.2.3) 21 + actionview (4.2.5.1)
  22 + activesupport (= 4.2.5.1)
23 builder (~> 3.1) 23 builder (~> 3.1)
24 erubis (~> 2.7.0) 24 erubis (~> 2.7.0)
25 rails-dom-testing (~> 1.0, >= 1.0.5) 25 rails-dom-testing (~> 1.0, >= 1.0.5)
26 rails-html-sanitizer (~> 1.0, >= 1.0.2) 26 rails-html-sanitizer (~> 1.0, >= 1.0.2)
27 - activejob (4.2.3)  
28 - activesupport (= 4.2.3) 27 + activejob (4.2.5.1)
  28 + activesupport (= 4.2.5.1)
29 globalid (>= 0.3.0) 29 globalid (>= 0.3.0)
30 - activemodel (4.2.3)  
31 - activesupport (= 4.2.3) 30 + activemodel (4.2.5.1)
  31 + activesupport (= 4.2.5.1)
32 builder (~> 3.1) 32 builder (~> 3.1)
33 - activerecord (4.2.3)  
34 - activemodel (= 4.2.3)  
35 - activesupport (= 4.2.3) 33 + activerecord (4.2.5.1)
  34 + activemodel (= 4.2.5.1)
  35 + activesupport (= 4.2.5.1)
36 arel (~> 6.0) 36 arel (~> 6.0)
37 - activesupport (4.2.3) 37 + activesupport (4.2.5.1)
38 i18n (~> 0.7) 38 i18n (~> 0.7)
39 json (~> 1.7, >= 1.7.7) 39 json (~> 1.7, >= 1.7.7)
40 minitest (~> 5.1) 40 minitest (~> 5.1)
41 thread_safe (~> 0.3, >= 0.3.4) 41 thread_safe (~> 0.3, >= 0.3.4)
42 tzinfo (~> 1.1) 42 tzinfo (~> 1.1)
43 addressable (2.3.8) 43 addressable (2.3.8)
44 - airbrake (4.3.0) 44 + airbrake (4.3.5)
45 builder 45 builder
46 multi_json 46 multi_json
47 arel (6.0.3) 47 arel (6.0.3)
@@ -89,6 +89,8 @@ GEM @@ -89,6 +89,8 @@ GEM
89 coderay (1.1.0) 89 coderay (1.1.0)
90 colorize (0.7.7) 90 colorize (0.7.7)
91 columnize (0.9.0) 91 columnize (0.9.0)
  92 + concurrent-ruby (1.0.0)
  93 + concurrent-ruby (1.0.0-java)
92 coveralls (0.8.2) 94 coveralls (0.8.2)
93 json (~> 1.8) 95 json (~> 1.8)
94 rest-client (>= 1.6.8, < 2) 96 rest-client (>= 1.6.8, < 2)
@@ -99,7 +101,7 @@ GEM @@ -99,7 +101,7 @@ GEM
99 addressable 101 addressable
100 debug_inspector (0.0.2) 102 debug_inspector (0.0.2)
101 decent_exposure (2.3.2) 103 decent_exposure (2.3.2)
102 - devise (3.5.1) 104 + devise (3.5.5)
103 bcrypt (~> 3.0) 105 bcrypt (~> 3.0)
104 orm_adapter (~> 0.1) 106 orm_adapter (~> 0.1)
105 railties (>= 3.2.6, < 5) 107 railties (>= 3.2.6, < 5)
@@ -139,7 +141,7 @@ GEM @@ -139,7 +141,7 @@ GEM
139 railties (>= 3.2, < 5.0) 141 railties (>= 3.2, < 5.0)
140 globalid (0.3.6) 142 globalid (0.3.6)
141 activesupport (>= 4.1.0) 143 activesupport (>= 4.1.0)
142 - haml (4.0.6) 144 + haml (4.0.7)
143 tilt 145 tilt
144 hashie (3.4.2) 146 hashie (3.4.2)
145 hipchat (1.5.1) 147 hipchat (1.5.1)
@@ -172,7 +174,7 @@ GEM @@ -172,7 +174,7 @@ GEM
172 launchy (2.4.3-java) 174 launchy (2.4.3-java)
173 addressable (~> 2.3) 175 addressable (~> 2.3)
174 spoon (~> 0.0.1) 176 spoon (~> 0.0.1)
175 - libv8 (3.16.14.7) 177 + libv8 (3.16.14.13)
176 loofah (2.0.3) 178 loofah (2.0.3)
177 nokogiri (>= 1.5.9) 179 nokogiri (>= 1.5.9)
178 mail (2.6.3) 180 mail (2.6.3)
@@ -182,10 +184,10 @@ GEM @@ -182,10 +184,10 @@ GEM
182 rack-contrib (~> 1.1) 184 rack-contrib (~> 1.1)
183 railties (>= 3.0.0, < 5.0.0) 185 railties (>= 3.0.0, < 5.0.0)
184 method_source (0.8.2) 186 method_source (0.8.2)
185 - mime-types (2.6.1) 187 + mime-types (2.99)
186 mimemagic (0.3.0) 188 mimemagic (0.3.0)
187 mini_portile2 (2.0.0) 189 mini_portile2 (2.0.0)
188 - minitest (5.8.3) 190 + minitest (5.8.4)
189 mongo (2.2.1) 191 mongo (2.2.1)
190 bson (~> 4.0) 192 bson (~> 4.0)
191 mongoid (5.0.2) 193 mongoid (5.0.2)
@@ -209,9 +211,9 @@ GEM @@ -209,9 +211,9 @@ GEM
209 net-ssh (>= 2.6.5) 211 net-ssh (>= 2.6.5)
210 net-ssh (2.9.2) 212 net-ssh (2.9.2)
211 netrc (0.10.3) 213 netrc (0.10.3)
212 - nokogiri (1.6.7.1) 214 + nokogiri (1.6.7.2)
213 mini_portile2 (~> 2.0.0.rc2) 215 mini_portile2 (~> 2.0.0.rc2)
214 - nokogiri (1.6.7.1-java) 216 + nokogiri (1.6.7.2-java)
215 oauth2 (1.0.0) 217 oauth2 (1.0.0)
216 faraday (>= 0.8, < 0.10) 218 faraday (>= 0.8, < 0.10)
217 jwt (~> 1.0) 219 jwt (~> 1.0)
@@ -260,6 +262,7 @@ GEM @@ -260,6 +262,7 @@ GEM
260 pry-rails (0.3.4) 262 pry-rails (0.3.4)
261 pry (>= 0.9.10) 263 pry (>= 0.9.10)
262 puma (2.15.3) 264 puma (2.15.3)
  265 + puma (2.15.3-java)
263 quiet_assets (1.1.0) 266 quiet_assets (1.1.0)
264 railties (>= 3.1, < 5.0) 267 railties (>= 3.1, < 5.0)
265 rack (1.6.4) 268 rack (1.6.4)
@@ -270,16 +273,16 @@ GEM @@ -270,16 +273,16 @@ GEM
270 rack-ssl-enforcer (0.2.8) 273 rack-ssl-enforcer (0.2.8)
271 rack-test (0.6.3) 274 rack-test (0.6.3)
272 rack (>= 1.0) 275 rack (>= 1.0)
273 - rails (4.2.3)  
274 - actionmailer (= 4.2.3)  
275 - actionpack (= 4.2.3)  
276 - actionview (= 4.2.3)  
277 - activejob (= 4.2.3)  
278 - activemodel (= 4.2.3)  
279 - activerecord (= 4.2.3)  
280 - activesupport (= 4.2.3) 276 + rails (4.2.5.1)
  277 + actionmailer (= 4.2.5.1)
  278 + actionpack (= 4.2.5.1)
  279 + actionview (= 4.2.5.1)
  280 + activejob (= 4.2.5.1)
  281 + activemodel (= 4.2.5.1)
  282 + activerecord (= 4.2.5.1)
  283 + activesupport (= 4.2.5.1)
281 bundler (>= 1.3.0, < 2.0) 284 bundler (>= 1.3.0, < 2.0)
282 - railties (= 4.2.3) 285 + railties (= 4.2.5.1)
283 sprockets-rails 286 sprockets-rails
284 rails-deprecated_sanitizer (1.0.3) 287 rails-deprecated_sanitizer (1.0.3)
285 activesupport (>= 4.2.0.alpha) 288 activesupport (>= 4.2.0.alpha)
@@ -287,7 +290,7 @@ GEM @@ -287,7 +290,7 @@ GEM
287 activesupport (>= 4.2.0.beta, < 5.0) 290 activesupport (>= 4.2.0.beta, < 5.0)
288 nokogiri (~> 1.6.0) 291 nokogiri (~> 1.6.0)
289 rails-deprecated_sanitizer (>= 1.0.1) 292 rails-deprecated_sanitizer (>= 1.0.1)
290 - rails-html-sanitizer (1.0.2) 293 + rails-html-sanitizer (1.0.3)
291 loofah (~> 2.0) 294 loofah (~> 2.0)
292 rails_12factor (0.0.3) 295 rails_12factor (0.0.3)
293 rails_serve_static_assets 296 rails_serve_static_assets
@@ -296,17 +299,17 @@ GEM @@ -296,17 +299,17 @@ GEM
296 rails (> 3.1) 299 rails (> 3.1)
297 rails_serve_static_assets (0.0.4) 300 rails_serve_static_assets (0.0.4)
298 rails_stdout_logging (0.0.3) 301 rails_stdout_logging (0.0.3)
299 - railties (4.2.3)  
300 - actionpack (= 4.2.3)  
301 - activesupport (= 4.2.3) 302 + railties (4.2.5.1)
  303 + actionpack (= 4.2.5.1)
  304 + activesupport (= 4.2.5.1)
302 rake (>= 0.8.7) 305 rake (>= 0.8.7)
303 thor (>= 0.18.1, < 2.0) 306 thor (>= 0.18.1, < 2.0)
304 rainbow (2.0.0) 307 rainbow (2.0.0)
305 - rake (10.4.2) 308 + rake (10.5.0)
306 ref (1.0.5) 309 ref (1.0.5)
307 request_store (1.1.0) 310 request_store (1.1.0)
308 - responders (2.1.0)  
309 - railties (>= 4.2.0, < 5) 311 + responders (2.1.1)
  312 + railties (>= 4.2.0, < 5.1)
310 rest-client (1.8.0) 313 rest-client (1.8.0)
311 http-cookie (>= 1.0.2, < 2.0) 314 http-cookie (>= 1.0.2, < 2.0)
312 mime-types (>= 1.16, < 3.0) 315 mime-types (>= 1.16, < 3.0)
@@ -368,12 +371,13 @@ GEM @@ -368,12 +371,13 @@ GEM
368 slop (3.6.0) 371 slop (3.6.0)
369 spoon (0.0.4) 372 spoon (0.0.4)
370 ffi 373 ffi
371 - sprockets (3.3.3)  
372 - rack (~> 1.0)  
373 - sprockets-rails (2.3.2)  
374 - actionpack (>= 3.0)  
375 - activesupport (>= 3.0)  
376 - sprockets (>= 2.8, < 4.0) 374 + sprockets (3.5.2)
  375 + concurrent-ruby (~> 1.0)
  376 + rack (> 1, < 3)
  377 + sprockets-rails (3.0.0)
  378 + actionpack (>= 4.0)
  379 + activesupport (>= 4.0)
  380 + sprockets (>= 3.0.0)
377 sshkit (1.7.1) 381 sshkit (1.7.1)
378 colorize (>= 0.7.0) 382 colorize (>= 0.7.0)
379 net-scp (>= 1.1.2) 383 net-scp (>= 1.1.2)
@@ -400,7 +404,7 @@ GEM @@ -400,7 +404,7 @@ GEM
400 unf (0.1.4-java) 404 unf (0.1.4-java)
401 unf_ext (0.0.7.1) 405 unf_ext (0.0.7.1)
402 useragent (0.14.0) 406 useragent (0.14.0)
403 - warden (1.2.3) 407 + warden (1.2.4)
404 rack (>= 1.0) 408 rack (>= 1.0)
405 websocket-driver (0.5.4) 409 websocket-driver (0.5.4)
406 websocket-extensions (>= 0.1.0) 410 websocket-extensions (>= 0.1.0)
@@ -417,10 +421,10 @@ PLATFORMS @@ -417,10 +421,10 @@ PLATFORMS
417 ruby 421 ruby
418 422
419 DEPENDENCIES 423 DEPENDENCIES
420 - actionmailer (~> 4.2.0) 424 + actionmailer (~> 4.2.5.1)
421 actionmailer_inline_css 425 actionmailer_inline_css
422 - actionpack (~> 4.2.0)  
423 - airbrake 426 + actionpack (~> 4.2.5.1)
  427 + airbrake (~> 4.3.5)
424 better_errors 428 better_errors
425 binding_of_caller 429 binding_of_caller
426 campy 430 campy
@@ -432,7 +436,7 @@ DEPENDENCIES @@ -432,7 +436,7 @@ DEPENDENCIES
432 capybara 436 capybara
433 coveralls 437 coveralls
434 decent_exposure 438 decent_exposure
435 - devise 439 + devise (~> 3.5.5)
436 dotenv-rails 440 dotenv-rails
437 draper 441 draper
438 email_spec 442 email_spec
@@ -449,7 +453,7 @@ DEPENDENCIES @@ -449,7 +453,7 @@ DEPENDENCIES
449 httparty 453 httparty
450 jquery-rails (~> 2.1.4) 454 jquery-rails (~> 2.1.4)
451 json 455 json
452 - kaminari (>= 0.14.1) 456 + kaminari (>= 0.16.3)
453 launchy 457 launchy
454 meta_request 458 meta_request
455 mongoid (= 5.0.2) 459 mongoid (= 5.0.2)
@@ -466,7 +470,7 @@ DEPENDENCIES @@ -466,7 +470,7 @@ DEPENDENCIES
466 rack-ssl-enforcer 470 rack-ssl-enforcer
467 rails_12factor 471 rails_12factor
468 rails_autolink 472 rails_autolink
469 - railties (~> 4.2.0) 473 + railties (~> 4.2.5.1)
470 ri_cal 474 ri_cal
471 rspec (~> 3.3) 475 rspec (~> 3.3)
472 rspec-activemodel-mocks 476 rspec-activemodel-mocks