diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-24 02:18:31 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-24 02:18:31 +0000 |
| commit | dadb8f2ada5030830ea37fd793ad5d2211adc063 (patch) | |
| tree | 1197efdcf08d435dc4b158bbfffa346cf683f6be /spec | |
| parent | 771e390351ac64e261218c502fe60edea7ab2100 (diff) | |
| parent | 3016719338e3cab69891198510e16e1fe4b6b3a1 (diff) | |
| download | gitlab-ce-dadb8f2ada5030830ea37fd793ad5d2211adc063.tar.gz | |
Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'
Enable Gitaly ref name caching for discussions.json
See merge request gitlab-org/gitlab-ce!29951
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 34cbf0c8723..0eca663a683 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1001,6 +1001,8 @@ describe Projects::MergeRequestsController do before do project.add_developer(user) sign_in(user) + + expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original end it 'returns 200' do |