-
- Downloads
Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master'
Updated diff toggle targets and added icon ## What does this MR do? Adds the new diff toggle icon and alters the toggle targets. User can now click on the file header bar _(where no other elements are above it, apart from the icon)_ and the `Click to expand` link to expand the diff and no where else. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant)  #### Gif  ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21369 Closes #20326 See merge request !6183
Showing
- app/assets/javascripts/single_file_diff.js 10 additions, 3 deletionsapp/assets/javascripts/single_file_diff.js
- app/assets/stylesheets/framework/blocks.scss 2 additions, 4 deletionsapp/assets/stylesheets/framework/blocks.scss
- app/assets/stylesheets/framework/files.scss 9 additions, 0 deletionsapp/assets/stylesheets/framework/files.scss
- app/views/projects/diffs/_content.html.haml 3 additions, 1 deletionapp/views/projects/diffs/_content.html.haml
- app/views/projects/diffs/_file_header.html.haml 1 addition, 0 deletionsapp/views/projects/diffs/_file_header.html.haml
- spec/features/expand_collapse_diffs_spec.rb 33 additions, 7 deletionsspec/features/expand_collapse_diffs_spec.rb
Loading
Please register or sign in to comment