-
- Downloads
Merge branch 'fix-comments' into 'master'
Fix comments Fixes: * drag-n-drop works for diff comments * selecting images works for diff comments * preview works for edit comments * drag-n-drop works for edit comments * selecting images works for edit comments * if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs. * Correctly hide form when edit comment on diff * fix full-screen for diff comments See merge request !1398
No related branches found
No related tags found
Showing
- CHANGELOG 3 additions, 0 deletionsCHANGELOG
- app/assets/javascripts/dispatcher.js.coffee 4 additions, 0 deletionsapp/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/dropzone_input.js.coffee 242 additions, 0 deletionsapp/assets/javascripts/dropzone_input.js.coffee
- app/assets/javascripts/markdown_area.js.coffee 0 additions, 241 deletionsapp/assets/javascripts/markdown_area.js.coffee
- app/assets/javascripts/notes.js.coffee 16 additions, 4 deletionsapp/assets/javascripts/notes.js.coffee
- app/assets/javascripts/zen_mode.js.coffee 9 additions, 3 deletionsapp/assets/javascripts/zen_mode.js.coffee
- app/assets/stylesheets/generic/forms.scss 0 additions, 133 deletionsapp/assets/stylesheets/generic/forms.scss
- app/assets/stylesheets/generic/zen.scss 98 additions, 0 deletionsapp/assets/stylesheets/generic/zen.scss
- app/assets/stylesheets/main/mixins.scss 0 additions, 4 deletionsapp/assets/stylesheets/main/mixins.scss
- app/assets/stylesheets/sections/markdown_area.scss 9 additions, 0 deletionsapp/assets/stylesheets/sections/markdown_area.scss
- app/assets/stylesheets/sections/note_form.scss 171 additions, 0 deletionsapp/assets/stylesheets/sections/note_form.scss
- app/assets/stylesheets/sections/notes.scss 0 additions, 166 deletionsapp/assets/stylesheets/sections/notes.scss
- app/views/projects/_zen.html.haml 6 additions, 3 deletionsapp/views/projects/_zen.html.haml
- app/views/projects/notes/_edit_form.html.haml 22 additions, 0 deletionsapp/views/projects/notes/_edit_form.html.haml
- app/views/projects/notes/_form.html.haml 4 additions, 3 deletionsapp/views/projects/notes/_form.html.haml
- app/views/projects/notes/_note.html.haml 2 additions, 20 deletionsapp/views/projects/notes/_note.html.haml
- spec/features/notes_on_merge_requests_spec.rb 12 additions, 16 deletionsspec/features/notes_on_merge_requests_spec.rb
Loading
Please register or sign in to comment