gitlab-org--gitlab-foss/app/views/discussions
Jacob Schatz ab3efb6664 Merge branch 'merge-request-push-compare-ui' into 'master'
Frontend for Merge Request Diff

This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience.

## Are there points in the code the reviewer needs to double check?

I could use feedback on this MR's fidelity to the design.  

## Why was this MR needed?

Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states.

## Screenshots (if relevant)

![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif)

## 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
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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/21427
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127

cc: @jschatz1 

See merge request !6343
2016-09-20 11:53:39 +00:00
..
_diff_discussion.html.haml Fix expansion of discussions in diff 2016-08-18 20:49:25 -05:00
_diff_with_notes.html.haml Fix bug where notes weren’t shown in discussion when the code had changed after creation 2016-08-19 12:38:40 -05:00
_discussion.html.haml Don’t depend on unique class. 2016-07-28 20:09:50 -06:00
_headline.html.haml Updates the text above discussions when resolving notes & discussions 2016-07-27 18:34:04 +01:00
_jump_to_next.html.haml Switch out comments_disabled for diff_notes_disabled. 2016-09-15 11:00:32 +02:00
_notes.html.haml Hide jump to next discussion button on commit notes 2016-09-20 10:52:55 +01:00
_parallel_diff_discussion.html.haml Show existing discussion when adding new comment on line with a hidden resolved discussion 2016-07-28 19:28:56 -06:00
_resolve_all.html.haml Don’t show “Resolve discussion” for non-author/members 2016-08-12 15:10:05 -05:00