Commit 19697710 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'sh-fix-license-check-migration' into 'master'

Fix upgrade failure in EE displaying license

Closes #207737

See merge request gitlab-org/gitlab!25788
parents bd392b93 671e19b6
---
title: Fix upgrade failure in EE displaying license
merge_request: 25788
author:
type: fixed
...@@ -10,7 +10,7 @@ Gitlab.ee do ...@@ -10,7 +10,7 @@ Gitlab.ee do
end end
# Needed to run migration # 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) message = LicenseHelper.license_message(signed_in: true, is_admin: true, in_html: false)
if ::License.block_changes? && message.present? if ::License.block_changes? && message.present?
warn "WARNING: #{message}" warn "WARNING: #{message}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment