diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-11 22:14:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-11 22:14:14 +0000 |
| commit | 04a3e60e419ed1e7a8f253c7200703179a2177e1 (patch) | |
| tree | f0e0ea7fd015755d326893694d40ccaf67899972 /app/views/projects/merge_requests | |
| parent | 56034433ee12c07ef990cd0fad25a5c7af3c7a6b (diff) | |
| parent | 543dcdacc2d4536ddeb1d88a7fa85e5fefed3f80 (diff) | |
| download | gitlab-ce-04a3e60e419ed1e7a8f253c7200703179a2177e1.tar.gz | |
Merge branch 'dm-outdated-diff-link' into 'master'
Link to outdated diff in older MR version from outdated diff discussion
Closes #27865
See merge request !10572
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show/_versions.html.haml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/show/_versions.html.haml b/app/views/projects/merge_requests/show/_versions.html.haml index 74a7b1dc498..547be78992e 100644 --- a/app/views/projects/merge_requests/show/_versions.html.haml +++ b/app/views/projects/merge_requests/show/_versions.html.haml @@ -72,13 +72,16 @@ = link_to namespace_project_compare_path(@project.namespace, @project, from: @start_version.base_commit_sha, to: @merge_request_diff.base_commit_sha) do new commits from - %code= @merge_request.target_branch + = succeed '.' do + %code= @merge_request.target_branch - - unless @merge_request_diff.latest? && !@start_sha + - if @diff_notes_disabled .comments-disabled-notif.content-block = icon('info-circle') - if @start_sha Comments are disabled because you're comparing two versions of this merge request. - else - Comments are disabled because you're viewing an old version of this merge request. - = link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm' + Discussions on this version of the merge request are displayed but comment creation is disabled. + + .pull-right + = link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm' |