Merge branch 'rails5/lock-gems' into develop

mysociety · May 23, 2019 · 2152b98 · 2152b98
2 parents ea46968 + 87d169c
commit 2152b98
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 59 deletions.
diff --git a/Gemfile b/Gemfile
@@ -95,23 +95,23 @@ gem 'cancancan', '~> 1.17.0', '< 2.0.0'
 gem 'charlock_holmes', '~> 0.7.0'
 gem 'dalli', '~> 2.7.0'
 gem 'dynamic_form', '~> 1.1.0'
-gem 'exception_notification', rails5? ? nil : ['~> 4.1.0', '< 4.1.2']
+gem 'exception_notification', ['~> 4.1.0', '< 4.1.2']
 gem 'fancybox-rails', '~> 0.3.0'
 gem 'geoip', '~> 1.6.4'
 gem 'gnuplot', '~> 2.6.0'
 gem 'htmlentities', '~> 4.3.0'
 gem 'icalendar', '~> 2.4.0'
-gem 'jquery-rails', rails5? ? nil : '~> 4.3.3'
-gem 'jquery-ui-rails', rails5? ? nil : '~> 6.0.0'
-gem 'json', rails5? ? nil : ['~> 1.8.0', '< 2.0.0']
+gem 'jquery-rails', '~> 4.3.3'
+gem 'jquery-ui-rails', '~> 6.0.0'
+gem 'json', ['~> 1.8.0', '< 2.0.0']
 gem 'holidays', '~> 4.7.0', '< 5.0.0'
 gem 'iso_country_codes', '~> 0.7.8'
 gem 'mail', '~> 2.6.6'
 gem 'mahoro', '~> 0.4'
 gem 'newrelic_rpm'
-gem 'nokogiri', rails5? ? nil : ['~> 1.6.0', '< 1.7']
+gem 'nokogiri', rails5? ? '~> 1.8.5' : ['~> 1.6.0', '< 1.7']
 gem 'open4', '~> 1.3.0'
-gem 'rack', rails5? ? nil : '~> 1.6.0'
+gem 'rack', rails5? ? '~> 2.0.0' : '~> 1.6.0'
 gem 'rack-ssl', '~> 1.4.0'
 gem 'rack-utf8_sanitizer', '~> 1.3.0'
 gem 'recaptcha', '~> 4.9.0', '< 4.10.0', :require => 'recaptcha/rails'
@@ -122,7 +122,7 @@ gem 'rubyzip', '~> 1.2.2'
 gem 'secure_headers', '~> 3.6.0'
 gem 'statistics2', '~> 0.54'
 gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :ref => 'c1c14da'
-gem 'stripe', rails5? ? nil : '~> 3.4.1'
+gem 'stripe', '~> 3.4.1'
 gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.5.0', '< 1.6.0'
 gem 'vpim', '~> 13.11.11'
@@ -134,14 +134,14 @@ gem 'xml-simple', '~> 1.1.0', :require => 'xmlsimple'
 gem 'gender_detector', '~> 1.0.0'
 
 # Gems related to internationalisation
-gem 'i18n', rails5? ? nil : ['~> 0.9.0', '< 0.9.3']
-gem 'rails-i18n', rails5? ? nil : ['~> 4.0.0', '< 5.0.0']
-gem 'gettext_i18n_rails', rails5? ? nil : ['~> 0.9.0', '< 1.0.0']
-  gem 'fast_gettext', rails5? ? nil : '< 1.2.0'
+gem 'i18n', ['~> 0.9.0', '< 0.9.3']
+gem 'rails-i18n', rails5? ? '~> 5.1.0' : ['~> 4.0.0', '< 5.0.0']
+gem 'gettext_i18n_rails', rails5? ? '~> 1.8.0' : ['~> 0.9.0', '< 1.0.0']
+  gem 'fast_gettext', '< 1.2.0'
 gem 'gettext', '~> 2.3.0'
-gem 'globalize', rails5? ? nil : ['~> 5.0.0', '< 5.1.0']
+gem 'globalize', rails5? ? '~> 5.1.0' : ['~> 5.0.0', '< 5.1.0']
 gem 'locale', '~> 2.0.0', '< 2.1.0'
-gem 'routing-filter', rails5? ? nil : '~> 0.6.2'
+gem 'routing-filter', '~> 0.6.2'
 gem 'unicode', '~> 0.4.4'
 gem 'unidecoder', '~> 1.1.0'
 gem 'money', '~> 6.13.2'
@@ -166,17 +166,17 @@ group :test do
   gem 'coveralls', '~> 0.8.0', :require => false
   gem 'capybara', rails5? ? '~> 3.5.0' : '~> 2.18.0'
   gem 'delorean', '~> 2.1.0'
-  gem 'stripe-ruby-mock', rails5? ? nil : '~> 2.5.4'
+  gem 'stripe-ruby-mock', '~> 2.5.4'
   gem('test_after_commit', '~> 1.1.0') unless rails5?
   gem('rails-controller-testing') if rails5?
 end
 
 group :test, :development do
-  gem 'bullet', rails5? ? nil : '~> 5.7.6'
+  gem 'bullet', '~> 5.7.6'
   gem 'factory_bot_rails', '~> 4.10.0'
   gem 'oink', '~> 0.10.1'
   gem 'rspec-activemodel-mocks', '~> 1.1.0'
-  gem 'rspec-rails', rails5? ? nil : '~> 3.7.2'
+  gem 'rspec-rails', '~> 3.7.2'
   gem 'pry', '~> 0.12.2'
   gem 'pry-byebug', '~> 3.4.0'
     gem 'public_suffix', '~> 2.0.0', '< 3.0.0'
@@ -185,7 +185,8 @@ end
 group :development do
   gem 'annotate', '~> 2.7.0'
   gem 'capistrano', '~> 2.15.0', '< 3.0.0'
-    gem 'net-ssh', rails5? ? nil : ['~> 2.9.0', '< 3.0.0']
+    gem 'net-ssh', ['~> 2.9.0', '< 3.0.0']
+      gem 'net-ssh-gateway', ['>= 1.1.0', '< 2.0.0']
     gem('mailcatcher', '~> 0.6.0') unless rails5? # https://github.com/sj26/mailcatcher#bundler
   gem('quiet_assets', '~> 1.1.0') unless rails5?
   gem 'launchy', '~> 2.4.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -475,6 +475,7 @@ DEPENDENCIES
   mime-types (< 3.0.0)
   money (~> 6.13.2)
   net-ssh (~> 2.9.0, < 3.0.0)
+  net-ssh-gateway (>= 1.1.0, < 2.0.0)
   newrelic_rpm
   nokogiri (~> 1.6.0, < 1.7)
   oink (~> 0.10.1)

diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
@@ -160,9 +160,9 @@ GEM
     dynamic_form (1.1.4)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    exception_notification (4.2.2)
-      actionmailer (>= 4.0, < 6)
-      activesupport (>= 4.0, < 6)
+    exception_notification (4.1.1)
+      actionmailer (>= 3.0.4)
+      activesupport (>= 3.0.4)
     execjs (2.7.0)
     factory_bot (4.10.0)
       activesupport (>= 3.0.0)
@@ -171,9 +171,9 @@ GEM
       railties (>= 3.0.0)
     fancybox-rails (0.3.1)
       railties (>= 3.1.0)
-    faraday (0.15.3)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    fast_gettext (1.7.0)
+    fast_gettext (1.1.2)
     ffi (1.9.25)
     flipper (0.10.2)
     flipper-active_record (0.10.2)
@@ -203,7 +203,7 @@ GEM
     hodel_3000_compliant_logger (0.1.1)
     holidays (4.7.0)
     htmlentities (4.3.4)
-    i18n (1.0.1)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     icalendar (2.4.1)
     iso_country_codes (0.7.8)
@@ -214,7 +214,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.1.0)
+    json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
@@ -233,14 +233,14 @@ GEM
     money (6.13.2)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
+    net-ssh (2.9.4)
+    net-ssh-gateway (1.3.0)
+      net-ssh (>= 2.6.5)
     newrelic_rpm (5.4.0.347)
     nio4r (2.3.1)
     nokogiri (1.8.5)
@@ -291,7 +291,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.1)
+    rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     railties (5.0.7)
@@ -320,23 +320,23 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -371,7 +371,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     statistics2 (0.54)
-    stripe (3.28.0)
+    stripe (3.4.1)
       faraday (~> 0.10)
     stripe-ruby-mock (2.5.5)
       dante (>= 0.2.0)
@@ -430,7 +430,7 @@ DEPENDENCIES
   annotate (~> 2.7.0)
   bcrypt (~> 3.1.12)
   bootstrap-sass (~> 2.3.2.2)
-  bullet
+  bullet (~> 5.7.6)
   cancancan (~> 1.17.0, < 2.0.0)
   capistrano (~> 2.15.0, < 3.0.0)
   capybara (~> 3.5.0)
@@ -441,61 +441,62 @@ DEPENDENCIES
   dalli (~> 2.7.0)
   delorean (~> 2.1.0)
   dynamic_form (~> 1.1.0)
-  exception_notification
+  exception_notification (~> 4.1.0, < 4.1.2)
   factory_bot_rails (~> 4.10.0)
   fancybox-rails (~> 0.3.0)
-  fast_gettext
+  fast_gettext (< 1.2.0)
   flipper-ui (~> 0.10.2)
   gender_detector (~> 1.0.0)
   geoip (~> 1.6.4)
   gettext (~> 2.3.0)
-  gettext_i18n_rails
-  globalize
+  gettext_i18n_rails (~> 1.8.0)
+  globalize (~> 5.1.0)
   gnuplot (~> 2.6.0)
   holidays (~> 4.7.0, < 5.0.0)
   htmlentities (~> 4.3.0)
-  i18n
+  i18n (~> 0.9.0, < 0.9.3)
   icalendar (~> 2.4.0)
   iso_country_codes (~> 0.7.8)
-  jquery-rails
-  jquery-ui-rails
-  json
+  jquery-rails (~> 4.3.3)
+  jquery-ui-rails (~> 6.0.0)
+  json (~> 1.8.0, < 2.0.0)
   launchy (~> 2.4.0)
   locale (~> 2.0.0, < 2.1.0)
   mahoro (~> 0.4)
   mail (~> 2.6.6)
   mime-types (< 3.0.0)
   money (~> 6.13.2)
-  net-ssh
+  net-ssh (~> 2.9.0, < 3.0.0)
+  net-ssh-gateway (>= 1.1.0, < 2.0.0)
   newrelic_rpm
-  nokogiri
+  nokogiri (~> 1.8.5)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
   pg (~> 0.20.0)
   pry (~> 0.12.2)
   pry-byebug (~> 3.4.0)
   public_suffix (~> 2.0.0, < 3.0.0)
-  rack
+  rack (~> 2.0.0)
   rack-ssl (~> 1.4.0)
   rack-utf8_sanitizer (~> 1.3.0)
   rails (= 5.0.7)
   rails-controller-testing
-  rails-i18n
+  rails-i18n (~> 5.1.0)
   recaptcha (~> 4.9.0, < 4.10.0)
   rmagick (~> 2.16.0)
   rolify (~> 5.2.0)
-  routing-filter
+  routing-filter (~> 0.6.2)
   rspec-activemodel-mocks (~> 1.1.0)
-  rspec-rails
+  rspec-rails (~> 3.7.2)
   rubocop (~> 0.63.1)
   ruby-msg (~> 1.5.0)!
   rubyzip (~> 1.2.2)
   sass-rails (~> 5.0.7)
   secure_headers (~> 3.6.0)
   statistics2 (~> 0.54)
   strip_attributes!
-  stripe
-  stripe-ruby-mock
+  stripe (~> 3.4.1)
+  stripe-ruby-mock (~> 2.5.4)
   syslog_protocol (~> 0.9.0)
   therubyracer (~> 0.12.0)
   thin (~> 1.5.0, < 1.6.0)