Merge branch 'upgrade-rails-5-2-ce' into 'master'

[CE] Upgrade to Rails 5.2

See merge request gitlab-org/gitlab-ce!30052

11 files changed, 50 insertions, 94 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
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ac9b02b08d5..3881f1be152 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -7,6 +7,7 @@ Rails.application.configure do
   config.cache_classes = false
 
   # Show full error reports and disable caching
+  config.active_record.verbose_query_logs  = true
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e7166882eea..a564ef74734 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -23,6 +23,7 @@ Rails.application.configure do
   config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
+  config.active_record.verbose_query_logs  = true
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index e95157bfde5..151bce4d130 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -22,7 +22,7 @@ if Gitlab::Database.postgresql?
     #
     # When schema dumping, `timestamptz` columns will be output as
     # `t.datetime_with_timezone`.
-    def initialize_type_map(mapping)
+    def initialize_type_map(mapping = type_map)
       super mapping
 
       mapping.register_type 'timestamptz' do |_, _, sql_type|
@@ -51,7 +51,7 @@ elsif Gitlab::Database.mysql?
     #
     # When schema dumping, `timestamp` columns will be output as
     # `t.datetime_with_timezone`.
-    def initialize_type_map(mapping)
+    def initialize_type_map(mapping = type_map)
       super mapping
 
       mapping.register_type(/timestamp/i) do |sql_type|
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 3b16014f302..a293909149e 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -1,9 +1,22 @@
 module ActiveRecord
   module Associations
     class Preloader
+      class NullPreloader
+        def self.new(klass, owners, reflection, preload_scope)
+          self
+        end
+
+        def self.run(preloader)
+        end
+
+        def self.preloaded_records
+          []
+        end
+      end
+
       module NoCommitPreloader
-        def preloader_for(reflection, owners, rhs_klass)
-          return NullPreloader if rhs_klass == ::Commit
+        def preloader_for(reflection, owners)
+          return NullPreloader if owners.first.association(reflection.name).klass == ::Commit
 
           super
         end
diff --git a/config/initializers/active_record_verbose_query_logs.rb b/config/initializers/active_record_verbose_query_logs.rb
deleted file mode 100644
index 1c5fbc8e830..00000000000
--- a/config/initializers/active_record_verbose_query_logs.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-# This is backport of https://github.com/rails/rails/pull/26815/files
-# Enabled by default for every non-production environment
-
-module ActiveRecord
-  class LogSubscriber
-    module VerboseQueryLogs
-      def debug(progname = nil, &block)
-        return unless super
-
-        log_query_source
-      end
-
-      def log_query_source
-        source_line, line_number = extract_callstack(caller_locations)
-
-        if source_line
-          if defined?(::Rails.root)
-            app_root = "#{::Rails.root}/".freeze
-            source_line = source_line.sub(app_root, "")
-          end
-
-          logger.debug("  ↳ #{source_line}:#{line_number}")
-        end
-      end
-
-      def extract_callstack(callstack)
-        line = callstack.find do |frame|
-          frame.absolute_path && !ignored_callstack(frame.absolute_path)
-        end
-
-        offending_line = line || callstack.first
-        [
-          offending_line.path,
-          offending_line.lineno,
-          offending_line.label
-        ]
-      end
-
-      LOG_SUBSCRIBER_FILE = ActiveRecord::LogSubscriber.method(:logger).source_location.first
-      RAILS_GEM_ROOT = File.expand_path("../../../..", LOG_SUBSCRIBER_FILE) + "/"
-      APP_CONFIG_ROOT = File.expand_path("..", __dir__) + "/"
-
-      def ignored_callstack(path)
-        path.start_with?(APP_CONFIG_ROOT, RAILS_GEM_ROOT, RbConfig::CONFIG["rubylibdir"])
-      end
-    end
-
-    if Rails.version.start_with?("5.2")
-      raise "Remove this monkey patch: #{__FILE__}"
-    else
-      prepend(VerboseQueryLogs) unless Rails.env.production?
-    end
-  end
-end
diff --git a/config/initializers/ar_speed_up_migration_checking.rb b/config/initializers/ar_speed_up_migration_checking.rb
index f98b246db0b..c4ffcc54cb2 100644
--- a/config/initializers/ar_speed_up_migration_checking.rb
+++ b/config/initializers/ar_speed_up_migration_checking.rb
@@ -2,17 +2,14 @@ if Rails.env.test?
   require 'active_record/migration'
 
   module ActiveRecord
-    class Migrator
-      class << self
-        alias_method :migrations_unmemoized, :migrations
+    class MigrationContext
+      alias_method :migrations_unmemoized, :migrations
 
-        # This method is called a large number of times per rspec example, and
-        # it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
-        # seconds per spec.
-        def migrations(paths)
-          @migrations ||= {}
-          (@migrations[paths] ||= migrations_unmemoized(paths)).dup
-        end
+      # This method is called a large number of times per rspec example, and
+      # it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
+      # seconds per spec.
+      def migrations
+        @migrations ||= migrations_unmemoized
       end
     end
   end
diff --git a/config/initializers/config_initializers_active_record_locking.rb b/config/initializers/config_initializers_active_record_locking.rb
index 608d63223a3..915247826e9 100644
--- a/config/initializers/config_initializers_active_record_locking.rb
+++ b/config/initializers/config_initializers_active_record_locking.rb
@@ -22,10 +22,11 @@ module ActiveRecord
           # Patched because when `lock_version` is read as `0`, it may actually be `NULL` in the DB.
           possible_previous_lock_value = previous_lock_value.to_i == 0 ? [nil, 0] : previous_lock_value
 
-          affected_rows = self.class.unscoped._update_record(
-            arel_attributes_with_values(attribute_names),
-            self.class.primary_key => id_in_database,
-            locking_column => possible_previous_lock_value
+          affected_rows = self.class.unscoped.where(
+            locking_column => possible_previous_lock_value,
+            self.class.primary_key => id_in_database
+          ).update_all(
+            attributes_with_values_for_update(attribute_names)
           )
 
           if affected_rows != 1
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 1ad93e14f7e..fbec28186eb 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -18,7 +18,7 @@ unless Sidekiq.server?
         .map { |k, v| { key: k, value: v } }
 
       payload = {
-        time: event.time.utc.iso8601(3),
+        time: Time.now.utc.iso8601(3),
         params: params,
         remote_ip: event.payload[:remote_ip],
         user_id: event.payload[:user_id],
diff --git a/config/initializers/mysql_ignore_postgresql_options.rb b/config/initializers/mysql_ignore_postgresql_options.rb
index 9a569be7674..e6a7d9bef52 100644
--- a/config/initializers/mysql_ignore_postgresql_options.rb
+++ b/config/initializers/mysql_ignore_postgresql_options.rb
@@ -15,7 +15,6 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
     module ConnectionAdapters
       class Mysql2Adapter < AbstractMysqlAdapter
         alias_method :__gitlab_add_index, :add_index
-        alias_method :__gitlab_add_index_sql, :add_index_sql
         alias_method :__gitlab_add_index_options, :add_index_options
 
         def add_index(table_name, column_name, options = {})
@@ -24,12 +23,6 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
           end
         end
 
-        def add_index_sql(table_name, column_name, options = {})
-          unless options[:opclasses]
-            __gitlab_add_index_sql(table_name, column_name, options)
-          end
-        end
-
         def add_index_options(table_name, column_name, options = {})
           if options[:using] && options[:using] == :gin
             options = options.dup
diff --git a/config/initializers/postgresql_cte.rb b/config/initializers/postgresql_cte.rb
index 56689bc8e74..68d53c4edbf 100644
--- a/config/initializers/postgresql_cte.rb
+++ b/config/initializers/postgresql_cte.rb
@@ -94,8 +94,8 @@ module ActiveRecord
       end
     end
 
-    def build_arel
-      arel = super()
+    def build_arel(aliases)
+      arel = super
 
       build_with(arel) if @values[:with]