summaryrefslogtreecommitdiff
path: root/spec/lib/feature
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-27 00:09:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-27 00:09:34 +0000
commit5a80b10a845c1df6d73804090265a3da67c6acc4 (patch)
treea0cc9c6a4e5307c37b1b7ad51c186d7351a8b788 /spec/lib/feature
parenta8324cd026394f672b0ae482aef0f5007fe1db8e (diff)
downloadgitlab-ce-5a80b10a845c1df6d73804090265a3da67c6acc4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/feature')
-rw-r--r--spec/lib/feature/gitaly_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb
index 696427bb8b6..6a93d3e3240 100644
--- a/spec/lib/feature/gitaly_spec.rb
+++ b/spec/lib/feature/gitaly_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Feature::Gitaly do
before do
skip_feature_flags_yaml_validation
+ skip_default_enabled_yaml_check
end
describe ".enabled?" do