diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:47:09 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:47:09 +0100 |
| commit | 048605bd33935cd2b37c72bf2b725e9c37e1f6e8 (patch) | |
| tree | caf35eb873412ae71721e9244c1f899e351cff3e /app/assets/javascripts/notes.js.coffee | |
| parent | a426fb1596978221510c8c78a17703658ad7d161 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-issue-closing-docs.tar.gz | |
Merge branch 'master' into issue-closing-docsissue-closing-docs
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index dd6cbcfc70b..533d00bfb0c 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -369,8 +369,8 @@ class @Notes note = $(this).closest(".note") note.find(".note-attachment").remove() note.find(".note-body > .note-text").show() - note.find(".js-note-attachment-delete").hide() - note.find(".note-edit-form").hide() + note.find(".note-header").show() + note.find(".current-note-edit-form").remove() ### Called when clicking on the "reply" button for a diff line. |