bump rails to 5.1

7 years ago · 9b2fec0e24
parent d70afce5e9
commit 9b2fec0e24
4 changed files with 64 additions and 76 deletions
--- a/7
+++ b/7
@ -33,14 +33,14 @@ ruby '~> 2.4.2'
 gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-session_store', '~> 1.1.0'
-gem 'rails', '~> 5.0.6'
+gem 'rails', '~> 5.1.5'
 gem 'responders', '~> 2.4'

 gem 'coderay', '~> 1.1.2'
 gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee'
 gem 'rdoc', '>= 2.4.2'

-gem 'globalize', git: 'https://github.com/globalize/globalize', ref: '38443bcd', require: false
+gem 'globalize', '~> 5.1.0.beta2', require: false
 gem 'omniauth', git: 'https://github.com/oliverguenther/omniauth', ref: '40c6f5f751d2da7cce5444bbd96c390c450440a9'
 gem 'request_store', '~> 1.3.1'

@ -106,7 +106,8 @@ gem 'rack-attack', '~> 5.0.1'
 gem 'okcomputer', '~> 1.16.0'

 # Patch Rails HTML whitelisting for Angular curly braces
-gem 'rails-angular-xss', git: 'https://github.com/opf/rails-angular-xss', ref: 'a45267d5'
+# TODO: reactivate after compatibility with 5.1 has been established
+# gem 'rails-angular-xss', git: 'https://github.com/opf/rails-angular-xss', ref: 'a45267d5'

 gem 'gon', '~> 6.2.0'
 gem "syck", '~> 1.3.0', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -20,16 +20,6 @@ GIT
    transactional_lock (0.1.0)
      activerecord (>= 4.0)

-GIT
-  remote: https://github.com/globalize/globalize
-  revision: 38443bcd07da78b7b8a9433e4c6c32dd51f964a3
-  ref: 38443bcd
-  specs:
-    globalize (5.1.0)
-      activemodel (>= 4.2, < 5.1)
-      activerecord (>= 4.2, < 5.1)
-      request_store (~> 1.0)
-
 GIT
  remote: https://github.com/goodwill/capybara-select2
  revision: 585192e4bb0db8d52e761ab68f08c17294806447
@ -58,14 +48,6 @@ GIT
      mixlib-shellout (~> 2.1.0)
      rubyzip

-GIT
-  remote: https://github.com/opf/rails-angular-xss
-  revision: a45267d53d32610bad01f903e9f1b49a81b7c37b
-  ref: a45267d5
-  specs:
-    rails-angular-xss (0.3.0.pre.pre)
-      rails (>= 5.0.0, < 5.1)
-
 GIT
  remote: https://github.com/rspec/rspec-activemodel-mocks
  revision: 5cd4c9d552bcc75d60ea4b7dda96e7377197ab8d
@ -78,54 +60,54 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (5.0.6)
-      actionpack (= 5.0.6)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
+      nio4r (~> 2.0)
      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.6)
-      actionpack (= 5.0.6)
-      actionview (= 5.0.6)
-      activejob (= 5.0.6)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (5.0.6)
-      actionview (= 5.0.6)
-      activesupport (= 5.0.6)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
    actionpack-xml_parser (2.0.1)
      actionpack (>= 5.0)
      railties (>= 5.0)
-    actionview (5.0.6)
-      activesupport (= 5.0.6)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
      builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
    active_record_query_trace (1.5.4)
-    activejob (5.0.6)
-      activesupport (= 5.0.6)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
      globalid (>= 0.3.6)
-    activemodel (5.0.6)
-      activesupport (= 5.0.6)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
    activemodel-serializers-xml (1.0.1)
      activemodel (> 5.x)
      activerecord (> 5.x)
      activesupport (> 5.x)
      builder (~> 3.1)
-    activerecord (5.0.6)
-      activemodel (= 5.0.6)
-      activesupport (= 5.0.6)
-      arel (~> 7.0)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
+      arel (~> 8.0)
    activerecord-session_store (1.1.0)
      actionpack (>= 4.0, < 5.2)
      activerecord (>= 4.0, < 5.2)
      multi_json (~> 1.11, >= 1.11.2)
      rack (>= 1.5.2, < 3)
      railties (>= 4.0, < 5.2)
-    activesupport (5.0.6)
+    activesupport (5.1.5)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (~> 0.7)
      minitest (~> 5.1)
@ -139,7 +121,7 @@ GEM
    airbrake (5.1.0)
      airbrake-ruby (~> 1.1)
    airbrake-ruby (1.5.0)
-    arel (7.1.4)
+    arel (8.0.0)
    ast (2.3.0)
    autoprefixer-rails (7.1.5)
      execjs
@ -205,7 +187,7 @@ GEM
    concurrent-ruby (1.0.5)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
-    crass (1.0.2)
+    crass (1.0.3)
    crowdin-api (0.5.0)
      rest-client (~> 2.0)
    cucumber (3.0.1)
@ -262,7 +244,7 @@ GEM
    equivalent-xml (0.6.0)
      nokogiri (>= 1.4.3)
    erbse (0.0.2)
-    erubis (2.7.0)
+    erubi (1.7.0)
    eventmachine (1.2.3)
    excon (0.52.0)
    execjs (2.7.0)
@ -297,8 +279,12 @@ GEM
      ruby-progressbar (~> 1.4)
    get_process_mem (0.2.1)
    gherkin (4.1.3)
-    globalid (0.4.0)
+    globalid (0.4.1)
      activesupport (>= 4.2.0)
+    globalize (5.1.0)
+      activemodel (>= 4.2, < 5.2)
+      activerecord (>= 4.2, < 5.2)
+      request_store (~> 1.0)
    gon (6.2.0)
      actionpack (>= 3.0)
      multi_json
@ -317,7 +303,7 @@ GEM
    htmldiff (0.0.1)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
-    i18n (0.9.0)
+    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    i18n-js (3.0.1)
      i18n (~> 0.6, >= 0.6.6)
@ -341,7 +327,7 @@ GEM
      sass
      thor
      tilt
-    loofah (2.1.1)
+    loofah (2.2.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.6.6)
@ -349,11 +335,13 @@ GEM
    meta-tags (2.6.0)
      actionpack (>= 3.2.0, < 5.3)
    method_source (0.8.2)
-    mime-types (2.99.3)
-    mini_mime (0.1.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
    mini_portile2 (2.3.0)
    minisyntax (0.2.5)
-    minitest (5.10.3)
+    minitest (5.11.3)
    mixlib-shellout (2.1.0)
    msgpack (1.1.0)
    multi_json (1.12.2)
@ -365,7 +353,7 @@ GEM
    net-ldap (0.16.0)
    netrc (0.11.0)
    newrelic_rpm (4.5.0.337)
-    nio4r (2.1.0)
+    nio4r (2.2.0)
    nokogiri (1.8.2)
      mini_portile2 (~> 2.3.0)
    oj (3.3.8)
@ -410,7 +398,7 @@ GEM
    public_suffix (3.0.0)
    rabl (0.13.1)
      activesupport (>= 2.3.14)
-    rack (2.0.3)
+    rack (2.0.4)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (5.0.1)
@ -422,17 +410,17 @@ GEM
    rack_session_access (0.1.1)
      builder (>= 2.0.0)
      rack (>= 1.0.0)
-    rails (5.0.6)
-      actioncable (= 5.0.6)
-      actionmailer (= 5.0.6)
-      actionpack (= 5.0.6)
-      actionview (= 5.0.6)
-      activejob (= 5.0.6)
-      activemodel (= 5.0.6)
-      activerecord (= 5.0.6)
-      activesupport (= 5.0.6)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)
      bundler (>= 1.3.0)
-      railties (= 5.0.6)
+      railties (= 5.1.5)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.2)
      actionpack (~> 5.x, >= 5.0.1)
@ -450,16 +438,16 @@ GEM
      rails (> 3.1)
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (5.0.6)
-      actionpack (= 5.0.6)
-      activesupport (= 5.0.6)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.2.2)
      rake
    raindrops (0.19.0)
-    rake (12.1.0)
+    rake (12.3.0)
    rb-fsevent (0.10.2)
    rb-inotify (0.9.10)
      ffi (>= 0.5.0, < 2)
@ -573,7 +561,7 @@ GEM
    ttfunk (1.5.0)
    typed_dag (2.0.2)
      rails (>= 5.0.4)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
      thread_safe (~> 0.1)
    tzinfo-data (1.2017.2)
      tzinfo (>= 1.0.0)
@ -603,7 +591,7 @@ GEM
      hashdiff
    websocket-driver (0.6.5)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
    will_paginate (3.1.6)
    xpath (2.1.0)
      nokogiri (~> 1.3)
@ -649,7 +637,7 @@ DEPENDENCIES
  fog-aws
  friendly_id (~> 5.2.1)
  fuubar (~> 2.2.0)
-  globalize!
+  globalize (~> 5.1.0.beta2)
  gon (~> 6.2.0)
  grape (~> 1.0)
  health_check
@ -685,8 +673,7 @@ DEPENDENCIES
  rack-protection (~> 2.0.0)
  rack-test (~> 0.6.3)
  rack_session_access
-  rails (~> 5.0.6)
-  rails-angular-xss!
+  rails (~> 5.1.5)
  rails-controller-testing (~> 1.0.2)
  rails_12factor
  rails_autolink (~> 1.1.6)
--- a/config.ru
+++ b/config.ru
@ -29,7 +29,7 @@

 # This file is used by Rack-based servers to start the application.

-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)

 ##
 # Use the worker killer when Unicorn is being used
--- a/config/initializers/reload_api.rb
+++ b/config/initializers/reload_api.rb
@ -33,7 +33,7 @@ if Rails.env.development?
  api_reloader = ActiveSupport::FileUpdateChecker.new(api_files) do
    Rails.application.reload_routes!
  end
-  ActionDispatch::Callbacks.to_prepare do
+  ActiveSupport::Reloader.to_prepare do
    api_reloader.execute_if_updated
  end
 end