Merge branch 'release/4.2' into release/5.0

pull/4005/merge
Oliver Günther 9 years ago
commit 8c151ad4a2
  1. 2
      Gemfile
  2. 8
      Gemfile.lock

@ -130,7 +130,7 @@ gem 'cocaine'
# also, better than thin since we can control worker concurrency.
gem 'unicorn'
gem 'nokogiri', '~> 1.6.6'
gem 'nokogiri', '~> 1.6.7'
gem 'carrierwave', '~> 0.10.0'
gem 'fog', '~> 1.23.0', require: 'fog/aws/storage'

@ -305,7 +305,7 @@ GEM
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.2)
mini_portile2 (2.0.0)
minitest (5.8.0)
mixlib-shellout (2.1.0)
multi_json (1.11.2)
@ -318,8 +318,8 @@ GEM
net-ssh (2.9.2)
netrc (0.11.0)
newrelic_rpm (3.14.1.311)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
non-stupid-digest-assets (1.0.4)
oj (2.11.5)
omniauth (1.2.2)
@ -598,7 +598,7 @@ DEPENDENCIES
mysql2 (~> 0.3.20)
net-ldap (~> 0.8.0)
newrelic_rpm
nokogiri (~> 1.6.6)
nokogiri (~> 1.6.7)
non-stupid-digest-assets
oj (~> 2.11.4)
omniauth

Loading…
Cancel
Save