Upgrade to Rails 5.2upgrade-rails-5-2-ce

Updates changed method names and fixes spec failures

1 files changed, 16 insertions, 10 deletions

diff --git a/config/application.rb b/config/application.rb
index edf8b3e87f9..de386506233 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,8 +1,14 @@
-require File.expand_path('boot', __dir__)
+require_relative 'boot'
 
-require 'rails/all'
+# Based on https://github.com/rails/rails/blob/v5.2.3/railties/lib/rails/all.rb
+# Only load the railties we need instead of loading everything
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
 
-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)
 
 module Gitlab
   class Application < Rails::Application
@@ -25,6 +31,8 @@ module Gitlab
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    config.active_record.sqlite3.represent_boolean_as_integer = true
+
     # Sidekiq uses eager loading, but directories not in the standard Rails
     # directories must be added to the eager load paths:
     # https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code
@@ -86,13 +94,6 @@ module Gitlab
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
-    # ActionCable mount point.
-    # The default Rails' mount point is `/cable` which may conflict with existing
-    # namespaces/users.
-    # https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38
-    # Please change this value when configuring ActionCable for real usage.
-    config.action_cable.mount_path = "/-/cable"
-
     # Configure sensitive parameters which will be filtered from the log file.
     #
     # Parameters filtered:
@@ -272,5 +273,10 @@ module Gitlab
       Gitlab::Routing.add_helpers(project_url_helpers)
       Gitlab::Routing.add_helpers(MilestonesRoutingHelper)
     end
+
+    # This makes generated cookies to be compatible with Rails 5.1 and older
+    # We can remove this when we're confident that there are no issues with the Rails 5.2 upgrade
+    # and we won't need to rollback to older versions
+    config.action_dispatch.use_authenticated_cookie_encryption = false
   end
 end