-
- 下载
Merge branch 'support-comment-parallel-diff' into 'master'
Support commenting on a diff in side-by-side view ### What does this MR do? This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment. There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later. ### Why was this MR needed? Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9283 ### Screenshot  See merge request !810
显示
- CHANGELOG 2 个添加, 0 个删除CHANGELOG
- app/assets/javascripts/notes.js.coffee 35 个添加, 10 个删除app/assets/javascripts/notes.js.coffee
- app/controllers/projects/notes_controller.rb 15 个添加, 2 个删除app/controllers/projects/notes_controller.rb
- app/helpers/notes_helper.rb 6 个添加, 4 个删除app/helpers/notes_helper.rb
- app/views/projects/commit/show.html.haml 1 个添加, 1 个删除app/views/projects/commit/show.html.haml
- app/views/projects/diffs/_parallel_view.html.haml 5 个添加, 1 个删除app/views/projects/diffs/_parallel_view.html.haml
- app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml 16 个添加, 16 个删除.../projects/notes/_diff_notes_with_reply_parallel.html.haml
- app/views/projects/notes/_form.html.haml 2 个添加, 0 个删除app/views/projects/notes/_form.html.haml
- app/views/projects/notes/_notes_with_form.html.haml 2 个添加, 2 个删除app/views/projects/notes/_notes_with_form.html.haml
- features/project/commits/diff_comments.feature 14 个添加, 0 个删除features/project/commits/diff_comments.feature
- features/steps/project/commits/commits.rb 1 个添加, 8 个删除features/steps/project/commits/commits.rb
- features/steps/shared/diff_note.rb 40 个添加, 0 个删除features/steps/shared/diff_note.rb
加载中
想要评论请 注册 或 登录