diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-09-08 13:25:04 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-09-08 13:25:04 +0000 |
commit | 7a3aeebb972eff6e1317eb061346f0fe7914ff64 (patch) | |
tree | 5575b88e0bd03294234af1b32ff14c761f5845a0 /app/assets/stylesheets | |
parent | d1dbc496783699a72bddb72c2ec7b16bb5fbad9a (diff) | |
parent | d41fc61fb45964810a98e38bd34c9a04f0a11ed8 (diff) | |
download | gitlab-ce-7a3aeebb972eff6e1317eb061346f0fe7914ff64.tar.gz |
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
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 7fdd79fa8b9..2a44b95de64 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -375,7 +375,7 @@ } } -.mr-version-switch { +.mr-version-controls { background: $background-color; padding: $gl-btn-padding; color: $gl-placeholder-color; |