Satisfy Douwe Maan

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.3.0 (unreleased)
-- Merge when build succeeds (Zeger-Jan van de Weg)
+  - Merge when build succeeds (Zeger-Jan van de Weg)
   - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
   - Fix 500 error when update group member permission
   - Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)

app/services/system_note_service.rb

@@ -132,7 +132,7 @@ def self.change_status(noteable, project, author, status, source)
 
   # Called when 'merge when build succeeds' is executed
   def self.merge_when_build_succeeds(noteable, project, author, last_commit)
-    body = "Enabled an automatic merge when the build for #{last_commit.to_reference} succeeds"
+    body = "Enabled an automatic merge when the build for #{last_commit.to_reference(project)} succeeds"
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end

spec/features/merge_requests/merge_when_build_succeeds_spec.rb

 require 'spec_helper'
-# rubocop:disable Lint/UselessAssignment
-# As rubocop doesn't see a need for both `ci_commit` and `ci_build`
 
 feature 'Merge When Build Succeeds', feature: true, js: true do
   let(:user) { create(:user) }
@@ -14,10 +12,10 @@
   end
 
   context "Active build for Merge Request" do
-    before do
-      ci_commit = create(:ci_commit, gl_project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch)
-      ci_build = create(:ci_build, commit: ci_commit)
+    let!(:ci_commit) { create(:ci_commit, gl_project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
 
+    before do
       login_as user
       visit_merge_request(merge_request)
     end
@@ -49,14 +47,15 @@
                                         merge_user: user, title: "MepMep", merge_when_build_succeeds: true)
     end
 
+    let!(:ci_commit) { create(:ci_commit, gl_project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
+
     before do
       merge_request.source_project.team << [user, :master]
       merge_request.source_branch = "feature"
       merge_request.target_branch = "master"
       merge_request.save!
 
-      ci_commit = create(:ci_commit, gl_project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch)
-      ci_build = create(:ci_build, commit: ci_commit)
 
       login_as user
       visit_merge_request(merge_request)
@@ -90,4 +89,3 @@ def visit_merge_request(merge_request)
     visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
   end
 end
-# rubocop:enable Lint/UselessAssignment