-
- Downloads
Merge branch 'dz-mr-version-compare' into 'master'
Allow compare merge request versions ## What does this MR do? Add new functionality to the merge request page. It allows you easily compare merge request versions in one click. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To improve code review experience. ## Screenshots (if relevant) See discussion ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/13570 See merge request !6127
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/stylesheets/pages/merge_requests.scss 1 addition, 1 deletionapp/assets/stylesheets/pages/merge_requests.scss
- app/controllers/projects/merge_requests_controller.rb 26 additions, 5 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/git_helper.rb 4 additions, 0 deletionsapp/helpers/git_helper.rb
- app/helpers/merge_requests_helper.rb 10 additions, 0 deletionsapp/helpers/merge_requests_helper.rb
- app/models/merge_request_diff.rb 4 additions, 0 deletionsapp/models/merge_request_diff.rb
- app/views/projects/merge_requests/show/_versions.html.haml 49 additions, 20 deletionsapp/views/projects/merge_requests/show/_versions.html.haml
- doc/user/project/merge_requests/versions.md 6 additions, 0 deletionsdoc/user/project/merge_requests/versions.md
- spec/features/merge_requests/merge_request_versions_spec.rb 37 additions, 6 deletionsspec/features/merge_requests/merge_request_versions_spec.rb
- spec/helpers/git_helper_spec.rb 9 additions, 0 deletionsspec/helpers/git_helper_spec.rb
Loading
Please register or sign in to comment