diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-20 10:47:43 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-20 11:07:11 -0500 |
| commit | 3d26b41c4a4a8e3cc1b5c6419cd0b2a7f8d4f945 (patch) | |
| tree | 669bd2d6add3860dadb0861ba38abce44dfbff7e | |
| parent | 57fef8b2a851597ed2a23cf3586aa81ee737d58f (diff) | |
| download | gitlab-ce-3d26b41c4a4a8e3cc1b5c6419cd0b2a7f8d4f945.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 aae10cb0d10..ab74f6ea03b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -52,6 +52,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) |