diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-20 11:53:39 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-20 11:53:39 +0000 |
| commit | ab3efb6664c17f1367772da3bbdc8648535adf63 (patch) | |
| tree | 5c1987d31b6f0852567ad955638d6775dde105de /CHANGELOG | |
| parent | 74725da142986a5fe55ae59ee202af3bcd56f79a (diff) | |
| parent | 2872c75266a2cffbde77a0b8a14e22effedd00ce (diff) | |
| download | gitlab-ce-ab3efb6664c17f1367772da3bbdc8648535adf63.tar.gz | |
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)
## 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
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0e4b620c8e0..389e5787e5f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -161,8 +161,10 @@ v 8.12.0 (unreleased) - Fix Gitlab::Popen.popen thread-safety issue - Add specs to removing project (Katarzyna Kobierska Ula Budziszewska) - Clean environment variables when running git hooks + - Add UX improvements for merge request version diffs - Fix Import/Export issues importing protected branches and some specific models - Fix non-master branch readme display in tree view + - Add UX improvements for merge request version diffs v 8.11.6 - Fix unnecessary horizontal scroll area in pipeline visualizations. !6005 |