Fix various minor deprecations and changes

* Disable locking at the class-level for `update_all`

* Fixes DEPRECATION WARNING: `ActiveRecord::Result#to_hash` has been
  renamed to `to_a`. `to_hash` is deprecated and will be removed in
  Rails 6.1.

* Fix lookup of CE views

  `view_paths=` was removed so we just create a new LookupContext
  here instead of duplicating then modifying the paths

* Fix some view related spec failures

* Fix database configuration for connection pools

  ActiveRecord::Base.configurations now returns a
  ActiveRecord::DatabaseConfigurations object

app/models/commit_status.rb

@@ -200,6 +200,10 @@ class CommitStatus < ApplicationRecord
     update_all('processed=TRUE, lock_version=COALESCE(lock_version,0)+1')
   end
 
+  def self.locking_enabled?
+    false
+  end
+
   def locking_enabled?
     will_save_change_to_status?
   end

app/models/concerns/issuable.rb

@@ -130,6 +130,10 @@ module Issuable
 
     strip_attributes :title
 
+    def self.locking_enabled?
+      false
+    end
+
     # We want to use optimistic lock for cases when only title or description are involved
     # http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html
     def locking_enabled?

app/models/merge_request.rb

@@ -712,7 +712,7 @@ class MergeRequest < ApplicationRecord
   end
 
   def validate_branch_name(attr)
-    return unless changes_include?(attr)
+    return unless will_save_change_to_attribute?(attr)
 
     branch = read_attribute(attr)
 

app/uploaders/object_storage.rb

@@ -125,7 +125,7 @@ module ObjectStorage
 
     included do
       include AfterCommitQueue
-      after_save on: [:create, :update] do
+      after_save do
         background_upload(changed_mounts)
       end
     end

app/views/projects/network/show.json.erb

-<% self.formats = ["html"] %>
+<% self.formats = [:html] %>
 
 <%= raw(
   {

config/initializers/active_record_preloader.rb

@@ -6,7 +6,7 @@ module ActiveRecord
           self
         end
 
-        def self.run(preloader)
+        def self.run
         end
 
         def self.preloaded_records

ee/app/finders/merge_requests_compliance_finder.rb

@@ -19,7 +19,7 @@ class MergeRequestsComplianceFinder < MergeRequestsFinder
       .limit(1)
       .to_sql
 
-    sql = find_group_projects.as('projects').to_sql
+    sql = find_group_projects.arel.as('projects').to_sql
     records = Project
       .select('projects.id, events.target_id as merge_request_id')
       .from([Arel.sql("#{sql} JOIN LATERAL (#{lateral}) #{Event.table_name} ON true")])

ee/app/helpers/ee/application_helper.rb

@@ -58,17 +58,11 @@ module EE
 
     def ce_lookup_context
       @ce_lookup_context ||= begin
-        context = lookup_context.dup
-
-        # This could duplicate the paths we're going to modify
-        context.view_paths = lookup_context.view_paths.paths
-
-        # Discard lookup path ee/ for the new paths
-        context.view_paths.paths.delete_if do |resolver|
+        ce_view_paths = lookup_context.view_paths.paths.reject do |resolver|
           resolver.to_path.start_with?("#{Rails.root}/ee")
         end
 
-        context
+        ActionView::LookupContext.new(ce_view_paths)
       end
     end
 

ee/app/models/concerns/ee/protected_ref_access.rb

@@ -19,7 +19,7 @@ module EE
         belongs_to :user
         belongs_to :group
 
-        protected_type = self.parent.model_name.singular
+        protected_type = self.module_parent.model_name.singular
         validates :group_id, uniqueness: { scope: protected_type, allow_nil: true }
         validates :user_id, uniqueness: { scope: protected_type, allow_nil: true }
         validates :access_level, uniqueness: { scope: protected_type, if: :role?,

ee/lib/elastic/class_proxy_util.rb

@@ -22,7 +22,7 @@ module Elastic
     alias_method :real_class, :class
 
     def version_namespace
-      self.class.parent
+      self.class.module_parent
     end
 
     class_methods do

ee/lib/elastic/instance_proxy_util.rb

@@ -22,7 +22,7 @@ module Elastic
     end
 
     def version_namespace
-      real_class.parent
+      real_class.module_parent
     end
 
     class_methods do

ee/lib/elastic/latest/config.rb

@@ -7,7 +7,7 @@ module Elastic
       extend Elasticsearch::Model::Indexing::ClassMethods
       extend Elasticsearch::Model::Naming::ClassMethods
 
-      self.index_name = [Rails.application.class.parent_name.downcase, Rails.env].join('-')
+      self.index_name = [Rails.application.class.module_parent_name.downcase, Rails.env].join('-')
 
       # ES6 requires a single type per index
       self.document_type = 'doc'

ee/lib/gitlab/geo/database_tasks.rb

@@ -46,7 +46,7 @@ module Gitlab
       end
 
       def migration_context
-        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths)
+        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration)
       end
 
       def abort_if_no_geo_config!

ee/spec/controllers/groups/insights_controller_spec.rb

@@ -79,7 +79,7 @@ describe Groups::InsightsController do
         it 'does return the default config' do
           subject
 
-          expect(response.parsed_body).to eq(parent_group.default_insights_config.to_json)
+          expect(response.parsed_body).to eq(parent_group.default_insights_config.as_json)
         end
       end
 

ee/spec/frontend/fixtures/saml_providers.rb

@@ -25,7 +25,7 @@ describe Groups::SamlProvidersController, '(JavaScript fixtures)', type: :contro
 
     get :show, params: { group_id: group }
 
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(response).to render_template 'groups/saml_providers/show'
   end
 end

ee/spec/helpers/application_helper_spec.rb

@@ -169,21 +169,21 @@ describe ApplicationHelper do
       it 'finds the CE partial' do
         ce_partial = helper.find_ce_template(partial)
 
-        expect(ce_partial.inspect).to eq(expected_partial_path)
+        expect(ce_partial.short_identifier).to eq(expected_partial_path)
 
         # And it could still find the EE partial
         ee_partial = helper.lookup_context.find(partial, [], true)
-        expect(ee_partial.inspect).to eq("ee/#{expected_partial_path}")
+        expect(ee_partial.short_identifier).to eq("ee/#{expected_partial_path}")
       end
 
       it 'finds the CE view' do
         ce_view = helper.find_ce_template(view)
 
-        expect(ce_view.inspect).to eq(expected_view_path)
+        expect(ce_view.short_identifier).to eq(expected_view_path)
 
         # And it could still find the EE view
         ee_view = helper.lookup_context.find(view, [], false)
-        expect(ee_view.inspect).to eq("ee/#{expected_view_path}")
+        expect(ee_view.short_identifier).to eq("ee/#{expected_view_path}")
       end
     end
   end

lib/gitlab/ci/config/external/file/template.rb

@@ -33,7 +33,7 @@ module Gitlab
             def template_name
               return unless template_name_valid?
 
-              location.first(-SUFFIX.length)
+              location.delete_suffix(SUFFIX)
             end
 
             def template_name_valid?

lib/gitlab/database.rb

@@ -204,15 +204,16 @@ module Gitlab
     # pool_size - The size of the DB pool.
     # host - An optional host name to use instead of the default one.
     def self.create_connection_pool(pool_size, host = nil, port = nil)
-      # See activerecord-4.2.7.1/lib/active_record/connection_adapters/connection_specification.rb
       env = Rails.env
-      original_config = ActiveRecord::Base.configurations
+      original_config = ActiveRecord::Base.configurations.to_h
 
       env_config = original_config[env].merge('pool' => pool_size)
       env_config['host'] = host if host
       env_config['port'] = port if port
 
-      config = original_config.merge(env => env_config)
+      config = ActiveRecord::DatabaseConfigurations.new(
+        original_config.merge(env => env_config)
+      )
 
       spec =
         ActiveRecord::

lib/gitlab/database/migration_helpers.rb

@@ -382,7 +382,7 @@ module Gitlab
         count_arel = table.project(Arel.star.count.as('count'))
         count_arel = yield table, count_arel if block_given?
 
-        total = exec_query(count_arel.to_sql).to_hash.first['count'].to_i
+        total = exec_query(count_arel.to_sql).to_a.first['count'].to_i
 
         return if total == 0
 
@@ -399,7 +399,7 @@ module Gitlab
 
         start_arel = table.project(table[:id]).order(table[:id].asc).take(1)
         start_arel = yield table, start_arel if block_given?
-        start_id = exec_query(start_arel.to_sql).to_hash.first['id'].to_i
+        start_id = exec_query(start_arel.to_sql).to_a.first['id'].to_i
 
         loop do
           stop_arel = table.project(table[:id])
@@ -409,7 +409,7 @@ module Gitlab
             .skip(batch_size)
 
           stop_arel = yield table, stop_arel if block_given?
-          stop_row = exec_query(stop_arel.to_sql).to_hash.first
+          stop_row = exec_query(stop_arel.to_sql).to_a.first
 
           update_arel = Arel::UpdateManager.new
             .table(table)

spec/config/application_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
-  FILTERED_PARAM = ActionDispatch::Http::ParameterFilter::FILTERED
+  FILTERED_PARAM = ActiveSupport::ParameterFilter::FILTERED
 
   context 'when parameters are logged' do
     describe 'rails does not leak confidential parameters' do

spec/controllers/concerns/metrics_dashboard_spec.rb

@@ -23,7 +23,7 @@ describe MetricsDashboard do
       routes.draw { get "metrics_dashboard" => "anonymous#metrics_dashboard" }
       response = get :metrics_dashboard, format: :json
 
-      JSON.parse(response.parsed_body)
+      response.parsed_body
     end
 
     context 'when no parameters are provided' do

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -604,7 +604,7 @@ describe 'Merge request > User sees merge widget', :js do
                 click_button 'addTest'
 
                 expect(page).to have_content('6.66')
-                expect(page).to have_content(sample_java_failed_message.gsub!(/\s+/, ' ').strip)
+                expect(page).to have_content(sample_java_failed_message.gsub(/\s+/, ' ').strip)
               end
             end
           end
@@ -649,7 +649,7 @@ describe 'Merge request > User sees merge widget', :js do
                 click_button 'Test#sum when a is 1 and b is 3 returns summary'
 
                 expect(page).to have_content('2.22')
-                expect(page).to have_content(sample_rspec_failed_message.gsub!(/\s+/, ' ').strip)
+                expect(page).to have_content(sample_rspec_failed_message.gsub(/\s+/, ' ').strip)
               end
             end
           end

spec/support/helpers/migrations_helpers.rb

@@ -21,7 +21,7 @@ module MigrationsHelpers
   end
 
   def migration_context
-    ActiveRecord::MigrationContext.new(migrations_paths)
+    ActiveRecord::MigrationContext.new(migrations_paths, ActiveRecord::SchemaMigration)
   end
 
   def migrations

spec/support/helpers/stub_configuration.rb

 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/transform_values'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/dependencies'