Incorporate feedback

2 files changed, 7 insertions, 8 deletions

diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_build_succeeds_service.rb
index 2f101e53a3f..5cf7404a493 100644
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
@@ -1,6 +1,6 @@
 module MergeRequests
   class MergeWhenBuildSucceedsService < MergeRequests::BaseService
-    # Marks the passed `merge_request` to be marked when the build succeeds or
+    # Marks the passed `merge_request` to be merged when the build succeeds or
     # updates the params for the automatic merge
     def execute(merge_request)
       merge_request.merge_params.merge!(params)
@@ -12,7 +12,7 @@ module MergeRequests
         merge_request.merge_when_build_succeeds = true
         merge_request.merge_user                = @current_user
 
-        SystemNoteService.merge_when_build_succeeds(merge_request, @project, @current_user, merge_request.ci_commit)
+        SystemNoteService.merge_when_build_succeeds(merge_request, @project, @current_user, merge_request.last_commit)
       end
 
       merge_request.save
@@ -25,8 +25,7 @@ module MergeRequests
       merge_requests.each do |merge_request|
         next unless merge_request.merge_when_build_succeeds?
 
-        ci_commit = merge_request.ci_commit
-        if ci_commit && ci_commit.success? && merge_request.mergeable?
+        if merge_request.ci_commit && merge_request.ci_commit.success? && merge_request.mergeable?
           MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params)
         end
       end
@@ -34,7 +33,7 @@ module MergeRequests
 
     # Cancels the automatic merge
     def cancel(merge_request)
-      if merge_request.merge_when_build_succeeds? && merge_request.open? && !merge_request.merged?
+      if merge_request.merge_when_build_succeeds? && merge_request.open?
         merge_request.reset_merge_when_build_succeeds
         SystemNoteService.cancel_merge_when_build_succeeds(merge_request, @project, @current_user)
 
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index ed557fef814..f84e480ca9c 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -131,15 +131,15 @@ class SystemNoteService
   end
 
   # Called when 'merge when build succeeds' is executed
-  def self.merge_when_build_succeeds(noteable, project, author, ci_commit)
-    body = "Enabled an automatic merge when the build for #{ci_commit.sha} succeeds"
+  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"
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
   # Called when 'merge when build succeeds' is canceled
   def self.cancel_merge_when_build_succeeds(noteable, project, author)
-    body = "Canceled the automatic merge"
+    body = "Cancelled the automatic merge"
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end