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

[CE] Upgrade to Rails 5.2

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

5 files changed, 8 insertions, 7 deletions

diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb
index 2a9b17ad22a..71bbc218f94 100644
--- a/lib/api/helpers/pagination.rb
+++ b/lib/api/helpers/pagination.rb
@@ -205,7 +205,9 @@ module API
 
           limited_total_count = pagination_data.total_count_with_limit
           if limited_total_count > Kaminari::ActiveRecordRelationMethods::MAX_COUNT_LIMIT
-            pagination_data.without_count
+            # The call to `total_count_with_limit` memoizes `@arel` because of a call to `references_eager_loaded_tables?`
+            # We need to call `reset` because `without_count` relies on `@arel` being unmemoized
+            pagination_data.reset.without_count
           else
             pagination_data
           end
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index ff73a49d5e8..100463fcb95 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -7,8 +7,7 @@ module API
       JOB_TOKEN_PARAM = :token
 
       def runner_registration_token_valid?
-        ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token],
-                                                                  Gitlab::CurrentSettings.runners_registration_token)
+        ActiveSupport::SecurityUtils.secure_compare(params[:token], Gitlab::CurrentSettings.runners_registration_token)
       end
 
       def authenticate_runner!
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 469a7fd9f7b..32d5e4b9ea3 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -45,7 +45,7 @@ module Gitlab
         # need to be added to the application settings. To prevent Rake tasks
         # and other callers from failing, use any loaded settings and return
         # defaults for missing columns.
-        if ActiveRecord::Migrator.needs_migration?
+        if ActiveRecord::Base.connection.migration_context.needs_migration?
           db_attributes = current_settings&.attributes || {}
           fake_application_settings(db_attributes)
         elsif current_settings.present?
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 1177f8ea99e..64e7f371115 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -128,7 +128,7 @@ module Gitlab
         order = "#{field} IS NULL, #{order}" if direction == 'ASC'
       end
 
-      order
+      Arel.sql(order)
     end
 
     def self.nulls_first_order(field, direction = 'ASC')
@@ -142,7 +142,7 @@ module Gitlab
         order = "#{field} IS NULL, #{order}" if direction == 'DESC'
       end
 
-      order
+      Arel.sql(order)
     end
 
     def self.random
diff --git a/lib/gitlab/database/grant.rb b/lib/gitlab/database/grant.rb
index 862ab96c887..26adf4e221b 100644
--- a/lib/gitlab/database/grant.rb
+++ b/lib/gitlab/database/grant.rb
@@ -24,7 +24,7 @@ module Gitlab
 
           begin
             from(nil)
-              .pluck("has_table_privilege(#{quoted_table}, 'TRIGGER')")
+              .pluck(Arel.sql("has_table_privilege(#{quoted_table}, 'TRIGGER')"))
               .first
           rescue ActiveRecord::StatementInvalid
             # This error is raised when using a non-existing table name. In this