diff options
author | Matthew Dodds <matthewrusselldodds@gmail.com> | 2016-09-29 21:51:33 -0400 |
---|---|---|
committer | Matthew Dodds <matthewrusselldodds@gmail.com> | 2016-09-29 21:51:33 -0400 |
commit | ec82cecf3c54cb2cd1ab7b72f77e787be1bf1264 (patch) | |
tree | 93dfe504596787d20faea4888b6e933128ccd917 /app/services/system_note_service.rb | |
parent | ce0591df704028c467dbb34c1521347c3b8c7cda (diff) | |
download | gitlab-ce-ec82cecf3c54cb2cd1ab7b72f77e787be1bf1264.tar.gz |
Add link to comparison from system note, update changelog
Diffstat (limited to 'app/services/system_note_service.rb')
-rw-r--r-- | app/services/system_note_service.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 0c8446e7c3d..8da1af67ee6 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -21,7 +21,8 @@ module SystemNoteService total_count = new_commits.length + existing_commits.length commits_text = "#{total_count} commit".pluralize(total_count) - body = "Added #{commits_text}:\n\n" + body = "[Compare with previous version](#{diff_comparison_url(noteable, project, oldrev)})\n\n" + body << "Added #{commits_text}:\n\n" body << existing_commit_summary(noteable, existing_commits, oldrev) body << new_commit_summary(new_commits).join("\n") @@ -466,4 +467,16 @@ module SystemNoteService def escape_html(text) Rack::Utils.escape_html(text) end + + def diff_comparison_url(merge_request, project, oldrev) + diff_id = merge_request.merge_request_diff.id + + Gitlab::Routing.url_helpers.diffs_namespace_project_merge_request_url( + project.namespace, + project, + merge_request.iid, + diff_id: diff_id, + start_sha: oldrev + ) + end end |