summaryrefslogtreecommitdiff
path: root/config/initializers/0_license.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 00:09:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 00:09:20 +0000
commit72721699f11187199e89631ce0b5e3d2f7c167e9 (patch)
treeb51a227be89d82aa24fc954e7b50e7b0933583cc /config/initializers/0_license.rb
parent06be418a7cd98a1c87c41ba43cca1ce9acbe885e (diff)
downloadgitlab-ce-72721699f11187199e89631ce0b5e3d2f7c167e9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/0_license.rb')
-rw-r--r--config/initializers/0_license.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb
index 19c71c34904..5c4546f499f 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 ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('licenses')
+ if Gitlab::Database.cached_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}"