diff options
| author | ash wilson <smashwilson@gmail.com> | 2013-05-30 23:16:49 +0000 |
|---|---|---|
| committer | Ash Wilson <smashwilson@gmail.com> | 2013-08-25 18:58:41 -0400 |
| commit | c8a115c0e3a9c8242c2a422572d47a49e0cb2874 (patch) | |
| tree | 5a36c3e0f364fdfb710e01090fc81b9676ea53c4 /app/views | |
| parent | 2b36dee64485062c69779217d4a202e5ca1b67bd (diff) | |
| download | gitlab-ce-c8a115c0e3a9c8242c2a422572d47a49e0cb2874.tar.gz | |
Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 594f4061c23..c4b614b51da 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -33,4 +33,10 @@ %i.icon-ok Merged by #{link_to_member(@project, @merge_request.merge_event.author)} #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. - + - if !@closes_issues.empty? && @merge_request.opened? + .ui-box-bottom.alert-info + %span + %i.icon-ok + Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} + = succeed '.' do + != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence) |