-
- Downloads
Merge branch 'diff-line-comment-vuejs' into 'master'
Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9f - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/javascripts/application.js 6 additions, 3 deletionsapp/assets/javascripts/application.js
- app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6 49 additions, 0 deletions...ascripts/diff_notes/components/comment_resolve_btn.js.es6
- app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 188 additions, 0 deletions...vascripts/diff_notes/components/jump_to_discussion.js.es6
- app/assets/javascripts/diff_notes/components/resolve_btn.js.es6 107 additions, 0 deletions...sets/javascripts/diff_notes/components/resolve_btn.js.es6
- app/assets/javascripts/diff_notes/components/resolve_count.js.es6 18 additions, 0 deletions...ts/javascripts/diff_notes/components/resolve_count.js.es6
- app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6 60 additions, 0 deletions...ripts/diff_notes/components/resolve_discussion_btn.js.es6
- app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 35 additions, 0 deletionsapp/assets/javascripts/diff_notes/diff_notes_bundle.js.es6
- app/assets/javascripts/diff_notes/mixins/discussion.js.es6 35 additions, 0 deletionsapp/assets/javascripts/diff_notes/mixins/discussion.js.es6
- app/assets/javascripts/diff_notes/mixins/namespace.js.es6 9 additions, 0 deletionsapp/assets/javascripts/diff_notes/mixins/namespace.js.es6
- app/assets/javascripts/diff_notes/models/discussion.js.es6 87 additions, 0 deletionsapp/assets/javascripts/diff_notes/models/discussion.js.es6
- app/assets/javascripts/diff_notes/models/note.js.es6 9 additions, 0 deletionsapp/assets/javascripts/diff_notes/models/note.js.es6
- app/assets/javascripts/diff_notes/services/resolve.js.es6 88 additions, 0 deletionsapp/assets/javascripts/diff_notes/services/resolve.js.es6
- app/assets/javascripts/diff_notes/stores/comments.js.es6 53 additions, 0 deletionsapp/assets/javascripts/diff_notes/stores/comments.js.es6
- app/assets/javascripts/merge_request.js 1 addition, 1 deletionapp/assets/javascripts/merge_request.js
- app/assets/javascripts/merge_request_tabs.js 6 additions, 0 deletionsapp/assets/javascripts/merge_request_tabs.js
- app/assets/javascripts/notes.js 83 additions, 12 deletionsapp/assets/javascripts/notes.js
- app/assets/javascripts/single_file_diff.js 13 additions, 3 deletionsapp/assets/javascripts/single_file_diff.js
- app/assets/stylesheets/behaviors.scss 3 additions, 3 deletionsapp/assets/stylesheets/behaviors.scss
- app/assets/stylesheets/pages/note_form.scss 26 additions, 0 deletionsapp/assets/stylesheets/pages/note_form.scss
Loading
Please register or sign in to comment