Merge branch 'release/4.3' into dev

pull/3271/head
Oliver Günther 9 years ago
commit 5655276f5a
  1. 2
      Gemfile
  2. 4
      Gemfile.lock

@ -128,7 +128,7 @@ gem 'unicorn'
# Gems we don't depend directly on, but specify here to make sure we don't use a vulnerable # Gems we don't depend directly on, but specify here to make sure we don't use a vulnerable
# version. Please add a link to a security advisory when adding a Gem here. # version. Please add a link to a security advisory when adding a Gem here.
gem 'rack', '~>1.4.6' gem 'rack', '~>1.4.7'
gem 'i18n', '~> 0.6.8' gem 'i18n', '~> 0.6.8'
# see https://groups.google.com/forum/#!topic/ruby-security-ann/pLrh6DUw998 # see https://groups.google.com/forum/#!topic/ruby-security-ann/pLrh6DUw998

@ -323,7 +323,7 @@ GEM
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rabl (0.9.3) rabl (0.9.3)
activesupport (>= 2.3.14) activesupport (>= 2.3.14)
rack (1.4.6) rack (1.4.7)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.2.0) rack-attack (4.2.0)
@ -541,8 +541,8 @@ DEPENDENCIES
pry-stack_explorer pry-stack_explorer
quiet_assets quiet_assets
rabl (= 0.9.3) rabl (= 0.9.3)
rack (~> 1.4.6)
rack-attack rack-attack
rack (~> 1.4.7)
rack-protection! rack-protection!
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rack_session_access rack_session_access

Loading…
Cancel
Save