diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-07 16:49:04 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-07 16:49:04 +0000 |
commit | 9dffd0ab6b2e9f5b0db55230d8991f50a01f7669 (patch) | |
tree | 52e1870616006021d7cd33a53cf20eb28b1251e7 /app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml | |
parent | ff6a3ae705bead7cc345cab3530cb82a0c74b043 (diff) | |
parent | daf9357aa92283e6cdd0d1e0cade65c8e2294540 (diff) | |
download | gitlab-ce-9dffd0ab6b2e9f5b0db55230d8991f50a01f7669.tar.gz |
Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'
Allow commenting on individual commits inside an MR
Closes #31847
See merge request gitlab-org/gitlab-ce!12148
Diffstat (limited to 'app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml new file mode 100644 index 00000000000..529fbb8547a --- /dev/null +++ b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml @@ -0,0 +1,17 @@ +- if @commit || @start_version || (@merge_request_diff && !@merge_request_diff.latest?) + .mr-version-controls + .content-block.comments-disabled-notif.clearfix + = icon('info-circle') + = succeed '.' do + - if @commit + Only comments from the following commit are shown below + - else + Not all comments are displayed because you're + - if @start_version + comparing two versions of the diff + - else + viewing an old version of the diff + .pull-right + = link_to diffs_project_merge_request_path(@merge_request.project, @merge_request), class: 'btn btn-sm' do + Show latest version + = "of the diff" if @commit |