diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:08:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 15:08:09 +0300 |
| commit | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch) | |
| tree | 64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /lib/feature | |
| parent | 6044caed20964a70c1ac6c5a3365d567ed96dfde (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/feature')
| -rw-r--r-- | lib/feature/gitaly.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb index d327162b34e..2d0fdf98e8c 100644 --- a/lib/feature/gitaly.rb +++ b/lib/feature/gitaly.rb @@ -14,6 +14,9 @@ class Feature end def server_feature_flags + # We need to check that both the DB connection and table exists + return {} unless ::Gitlab::Database.cached_table_exists?(FlipperFeature.table_name) + Feature.persisted_names .select { |f| f.start_with?(PREFIX) } .map do |f| |