diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 00:09:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 00:09:20 +0000 |
| commit | 72721699f11187199e89631ce0b5e3d2f7c167e9 (patch) | |
| tree | b51a227be89d82aa24fc954e7b50e7b0933583cc /lib/gitlab/marginalia.rb | |
| parent | 06be418a7cd98a1c87c41ba43cca1ce9acbe885e (diff) | |
| download | gitlab-ce-72721699f11187199e89631ce0b5e3d2f7c167e9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/marginalia.rb')
| -rw-r--r-- | lib/gitlab/marginalia.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/marginalia.rb b/lib/gitlab/marginalia.rb index b4b9896e6b9..24e21a1d512 100644 --- a/lib/gitlab/marginalia.rb +++ b/lib/gitlab/marginalia.rb @@ -22,7 +22,7 @@ module Gitlab def self.set_feature_cache # During db:create and db:bootstrap skip feature query as DB is not available yet. - return false unless ActiveRecord::Base.connected? && Gitlab::Database.cached_table_exists?('features') + return false unless Gitlab::Database.cached_table_exists?('features') self.enabled = Feature.enabled?(MARGINALIA_FEATURE_FLAG) end |