diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-09-28 10:48:26 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-29 13:41:27 +0300 |
| commit | 50e2bd22954a92ef2f3f7c7c899ad8e700d84d17 (patch) | |
| tree | bdbbb7f70020ac84ed6333ec2be65c0c5a9527d8 | |
| parent | 666762f2ded91d10d5dece3c47bf208c792d5d28 (diff) | |
| download | gitlab-ce-21535-fix-hidden-diff-comments.tar.gz | |
make sure split-view diff discussions are made visible by "toggle comments" button21535-fix-hidden-diff-comments
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index da436431c7f..5d7e6113075 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ v 8.13.0 (unreleased) - Revoke button in Applications Settings underlines on hover. - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe) - Add organization field to user profile + - Fix resolved discussion display in side-by-side diff view !6575 - Optimize GitHub importing for speed and memory - API: expose pipeline data in builds API (!6502, Guilherme Salazar) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c029bf3b5ca..8a61669822c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -247,7 +247,7 @@ $this.toggleClass('active'); var notesHolders = $this.closest('.diff-file').find('.notes_holder'); if ($this.hasClass('active')) { - notesHolders.show(); + notesHolders.show().find('.hide').show(); } else { notesHolders.hide(); } |