summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-04-02 14:29:49 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-04-02 14:29:49 +0000
commit723f936fb1805ccd4c0d03f6f8599dbc4a2f5570 (patch)
treebebe2756a26d47e4fbf7ab232289662fe0baecd7 /spec
parent8b9da458ec31d053da0a26cf7b23ecf2f8baa8a6 (diff)
parente37383d45395c0c7cefc1dda3be12bd4c2d6cc4f (diff)
downloadgitlab-ce-723f936fb1805ccd4c0d03f6f8599dbc4a2f5570.tar.gz
Merge branch 'sh-cache-pipeline-find-commits' into 'master'
Cache FindCommit results in pipelines view See merge request gitlab-org/gitlab-ce!26776
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/projects/pipelines_controller_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index ece8532cb84..b64ae552efc 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -28,6 +28,8 @@ describe Projects::PipelinesController do
end
it 'returns serialized pipelines', :request_store do
+ expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
+
queries = ActiveRecord::QueryRecorder.new do
get_pipelines_index_json
end