diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-20 18:48:04 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-06 18:50:58 -0400 |
| commit | 6ce25e7b4caa9e94de74378729178c7060d640b2 (patch) | |
| tree | 8f7b7ba4d83d20bffe7bb50fba1942fd6c9c5b80 /spec/services/system_note_service_spec.rb | |
| parent | 18a5bb05204ee437902d82e5973a427b9aac6d53 (diff) | |
| download | gitlab-ce-6ce25e7b4caa9e94de74378729178c7060d640b2.tar.gz | |
Rename MergeRequest methods that return commits or shas to be more clear and consistent
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 85dd30bf48c..43693441450 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -213,7 +213,7 @@ describe SystemNoteService, services: true do create(:merge_request, source_project: project, target_project: project) end - subject { described_class.merge_when_build_succeeds(noteable, project, author, noteable.last_commit) } + subject { described_class.merge_when_build_succeeds(noteable, project, author, noteable.diff_head_commit) } it_behaves_like 'a system note' |