-
- Downloads
Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'
Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
Showing
- app/assets/stylesheets/pages/diff.scss 0 additions, 6 deletionsapp/assets/stylesheets/pages/diff.scss
- app/assets/stylesheets/pages/merge_requests.scss 0 additions, 1 deletionapp/assets/stylesheets/pages/merge_requests.scss
- app/controllers/projects/merge_requests_controller.rb 9 additions, 6 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/notes_helper.rb 10 additions, 14 deletionsapp/helpers/notes_helper.rb
- app/models/concerns/discussion_on_diff.rb 1 addition, 0 deletionsapp/models/concerns/discussion_on_diff.rb
- app/models/concerns/note_on_diff.rb 4 additions, 0 deletionsapp/models/concerns/note_on_diff.rb
- app/models/diff_discussion.rb 19 additions, 1 deletionapp/models/diff_discussion.rb
- app/models/diff_note.rb 4 additions, 3 deletionsapp/models/diff_note.rb
- app/models/legacy_diff_discussion.rb 14 additions, 4 deletionsapp/models/legacy_diff_discussion.rb
- app/models/merge_request.rb 12 additions, 6 deletionsapp/models/merge_request.rb
- app/models/note.rb 13 additions, 9 deletionsapp/models/note.rb
- app/views/discussions/_diff_with_notes.html.haml 1 addition, 1 deletionapp/views/discussions/_diff_with_notes.html.haml
- app/views/discussions/_discussion.html.haml 1 addition, 1 deletionapp/views/discussions/_discussion.html.haml
- app/views/projects/diffs/_line.html.haml 1 addition, 1 deletionapp/views/projects/diffs/_line.html.haml
- app/views/projects/merge_requests/show/_versions.html.haml 8 additions, 6 deletionsapp/views/projects/merge_requests/show/_versions.html.haml
- changelogs/unreleased/dm-comment-on-diff-versions.yml 4 additions, 0 deletionschangelogs/unreleased/dm-comment-on-diff-versions.yml
- spec/features/merge_requests/versions_spec.rb 72 additions, 6 deletionsspec/features/merge_requests/versions_spec.rb
- spec/helpers/notes_helper_spec.rb 139 additions, 0 deletionsspec/helpers/notes_helper_spec.rb
- spec/models/diff_discussion_spec.rb 75 additions, 8 deletionsspec/models/diff_discussion_spec.rb
- spec/models/diff_note_spec.rb 35 additions, 17 deletionsspec/models/diff_note_spec.rb
Loading
Please register or sign in to comment