diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-20 10:47:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-20 10:47:43 +0000 |
| commit | 9346a8d9b5917411e31f2d2aa83c3bb005c83fda (patch) | |
| tree | 8d53285d8e96924cf7e8e41bed9604e720f78d68 | |
| parent | e261579909eb8a3e00281ea68f4c807c2bd4a1d0 (diff) | |
| parent | f37a793f4714c2073cf614039f744544674bd011 (diff) | |
| download | gitlab-ce-9346a8d9b5917411e31f2d2aa83c3bb005c83fda.tar.gz | |
Merge branch 'commit-notes-jump-to-button-remove' into 'master'
Hide jump to next discussion button on commit notes
## What are the relevant issue numbers?
Closes #22354
See merge request !6428
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index ebc3507901c..c3903f94188 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -54,6 +54,7 @@ v 8.12.0 (unreleased) - Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps) - Fix bug stopping issue description being scrollable after selecting issue template - Remove suggested colors hover underline (ClemMakesApps) + - Fix jump to discussion button being displayed on commit notes - Shorten task status phrase (ClemMakesApps) - Fix project visibility level fields on settings - Add hover color to emoji icon (ClemMakesApps) diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index fbe470bed2c..dfdbdf1f969 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -10,6 +10,7 @@ .btn-group{ role: "group" } = link_to_reply_discussion(discussion, line_type) = render "discussions/resolve_all", discussion: discussion - = render "discussions/jump_to_next", discussion: discussion + - if discussion.for_merge_request? + = render "discussions/jump_to_next", discussion: discussion - else = link_to_reply_discussion(discussion) |