Merge branch 'reference_merge_request_in_commit_message' into 'master'

Add reference to the merge request in the default merge request commit message This adds a link to the merge request to the merge request commit. If merge requests are used for code review, the merge in git is now linked to the code review. See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a

Merge branch 'reference_merge_request_in_commit_message' into 'master'
30b72919 · Dmitriy Zaporozhets · 119b0287 · c1b7e904 · 30b72919 · 30b72919
Commit 30b72919 authored Jul 02, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

merge_request.rb app/models/merge_request.rb +2 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.1.0
  - Add @all mention for comments
  - Dont show reply button if user is not signed in
  - Expose more information for issues with webhook
+  - Add a mention of the merge request into the default merge request commit message

 v 7.0.0
  - The CPU no longer overheats when you hold down the spacebar

--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -293,6 +293,8 @@ class MergeRequest < ActiveRecord::Base
    message << title.to_s
    message << "\n\n"
    message << description.to_s
+    message << "\n\n"
+    message << "See merge request !#{iid}"
    message
  end