summaryrefslogtreecommitdiff
path: root/spec/lib/feature
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 18:08:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 18:08:26 +0000
commitb64a8161c9442d82897a341d6bf935dd3e748b06 (patch)
treeb9953db8607d1393aa8ac588a15f184dd8e183f6 /spec/lib/feature
parent6e33325c1458cb31b4d36a7eec817fa00ec3faaf (diff)
downloadgitlab-ce-b64a8161c9442d82897a341d6bf935dd3e748b06.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/feature')
-rw-r--r--spec/lib/feature/gitaly_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb
index 08651c42276..6654b7627cd 100644
--- a/spec/lib/feature/gitaly_spec.rb
+++ b/spec/lib/feature/gitaly_spec.rb
@@ -25,7 +25,7 @@ describe Feature::Gitaly do
describe ".server_feature_flags" do
before do
- allow(Feature).to receive(:persisted_names).and_return(%w[gitaly_mep_mep foo])
+ stub_feature_flags(gitaly_mep_mep: true, foo: true)
end
subject { described_class.server_feature_flags }