summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2018-02-28 17:56:00 +0100
committerAhmad Sherif <me@ahmadsherif.com>2018-03-01 18:31:31 +0100
commit03f3350f3f679122ce4ceacfc840db6e77763dea (patch)
tree7569d6f1aef894ef13acf262b87b4419f6270d8d /spec/services/merge_requests
parent1c2b633b1f4817ca4a3184fb7ff73b1d6b2bbb8f (diff)
downloadgitlab-ce-03f3350f3f679122ce4ceacfc840db6e77763dea.tar.gz
Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batch
Closes gitaly#1046
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/build_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 3a935d98540..6aed481939e 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -15,8 +15,8 @@ describe MergeRequests::BuildService do
let(:target_branch) { 'master' }
let(:merge_request) { service.execute }
let(:compare) { double(:compare, commits: commits) }
- let(:commit_1) { double(:commit_1, safe_message: "Initial commit\n\nCreate the app") }
- let(:commit_2) { double(:commit_2, safe_message: 'This is a bad commit message!') }
+ let(:commit_1) { double(:commit_1, sha: 'f00ba7', safe_message: "Initial commit\n\nCreate the app") }
+ let(:commit_2) { double(:commit_2, sha: 'f00ba7', safe_message: 'This is a bad commit message!') }
let(:commits) { nil }
let(:service) do