summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-06-20 18:48:04 +0200
committerDouwe Maan <douwe@selenight.nl>2016-07-06 18:50:58 -0400
commit6ce25e7b4caa9e94de74378729178c7060d640b2 (patch)
tree8f7b7ba4d83d20bffe7bb50fba1942fd6c9c5b80 /features
parent18a5bb05204ee437902d82e5973a427b9aac6d53 (diff)
downloadgitlab-ce-6ce25e7b4caa9e94de74378729178c7060d640b2.tar.gz
Rename MergeRequest methods that return commits or shas to be more clear and consistent
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 640f1720a6c..3611c187202 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -519,7 +519,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step '"Bug NS-05" has CI status' do
project = merge_request.source_project
project.enable_ci
- pipeline = create :ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch
+ pipeline = create :ci_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch
create :ci_build, pipeline: pipeline
end