diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-04 16:42:36 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-04 16:42:36 +0200 |
| commit | b48b07044b919c07de34434aea7cdba13d7c38a6 (patch) | |
| tree | 5a6d9d8de1048280a595825aa5f47464455ad670 /app/assets/javascripts/notes.js.coffee | |
| parent | c17f5d06aa4a55a8446928ea6b690ae8e09ce237 (diff) | |
| parent | 326b827ce39f998ce75f58e9f649e6b50623f1aa (diff) | |
| download | gitlab-ce-b48b07044b919c07de34434aea7cdba13d7c38a6.tar.gz | |
Merge branch 'master' into drop-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 1c05a2b9fe8..0021d17d85e 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -10,7 +10,6 @@ class @Notes constructor: (notes_url, note_ids, last_fetched_at, view) -> @notes_url = notes_url - @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root? @note_ids = note_ids @last_fetched_at = last_fetched_at @view = view @@ -298,7 +297,7 @@ class @Notes note.find(".note-header").hide() base_form = note.find(".note-edit-form") form = base_form.clone().insertAfter(base_form) - form.addClass('current-note-edit-form') + form.addClass('current-note-edit-form gfm-form') form.find('.div-dropzone').remove() # Show the attachment delete link |