diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-25 20:54:42 +0300 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-12 05:15:31 +0300 |
| commit | aeb67dd489b1ccc7f0ab1d702725729ab9cc3e27 (patch) | |
| tree | c508ba9459274be6a8a0488a838d31f03f45faba /lib/gitlab/current_settings.rb | |
| parent | ecffca5d92353d55aaf8f984737fa617782310e0 (diff) | |
Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |