diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:01:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:01:09 +0000 |
commit | 00df932c458bdd6bb2107760875124054f15543f (patch) | |
tree | 69ba5a137f282db7d6e6a7d83032bba089d872cf /config | |
parent | 3455664e4c7afc1387ef58849dcfc837b418837c (diff) | |
download | gitlab-ce-00df932c458bdd6bb2107760875124054f15543f.tar.gz |
Add latest changes from gitlab-org/gitlab@12-8-stable-ee
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/0_license.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index 5c4546f499f..19c71c34904 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -10,7 +10,7 @@ Gitlab.ee do end # Needed to run migration - if Gitlab::Database.cached_table_exists?('licenses') + if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('licenses') message = LicenseHelper.license_message(signed_in: true, is_admin: true, in_html: false) if ::License.block_changes? && message.present? warn "WARNING: #{message}" |