Age | Commit message (Collapse) | Author |
|
and adds some refactors
|
|
|
|
|
|
|
|
project
|
|
Check for pipelines when setting page_gutter_class.
## What does this MR do?
Fixes regression issue related to the MR window sliding behind the right sidebar on page refresh.
## Are there points in the code the reviewer needs to double check?
I'm getting stuck thinking about if/how to test this. Or maybe it just deserves a note somewhere about remembering to update `page_gutter_class` when a new route is added?
## Why was this MR needed?
This regression prevented users from using many features of the MR view.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/21121
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-23_at_11.08.04_AM](/uploads/bad1a83569022a7fc699a978c5abef62/Screen_Shot_2016-08-23_at_11.08.04_AM.png)
After:
![Screen_Shot_2016-08-23_at_11.07.46_AM](/uploads/6cbcb2f849c68dfc93d8a4b53089b06e/Screen_Shot_2016-08-23_at_11.07.46_AM.png)
## 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
- [ ] 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)
cc: @jschatz1
See merge request !5952
|
|
Added search for all lists on issue boards
## What does this MR do?
Adds a search box to allow the user to search all lists in issue boards rather than just the backlog.
## Screenshots (if relevant)
![Screen_Shot_2016-08-30_at_10.33.15](/uploads/67e96055d60a9b3209ce3831a1980c09/Screen_Shot_2016-08-30_at_10.33.15.png)
![Screen_Shot_2016-08-30_at_10.33.19](/uploads/8d5253b8f2ecf1cf9a69d70be8ccf1f9/Screen_Shot_2016-08-30_at_10.33.19.png)
## What are the relevant issue numbers?
Closes #21139
See merge request !6101
|
|
Added project specific enable/disable setting for LFS
## What does this MR do?
Adds project specific enable/disable setting for LFS
## What are the relevant issue numbers?
Needed for #18092
See merge request !5997
|
|
Resize created icon
## What does this MR do?
Resizes `created` SVG
## Why was this MR needed?
Because:
![Screen_Shot_2016-08-30_at_3.33.38_PM](/uploads/c4c987e323b4c9cedeb298f08abbc307/Screen_Shot_2016-08-30_at_3.33.38_PM.png)
Hard-coding in the size into the SVG isn't a great solution, but we've got a bit of technical debt here. All the other icons are sized this way, so for this patch fix I think we should just match it. Ideally we'll have classes directly in the SVG code so we can target all these icons properly, and do all color/sizing through CSS
## Screenshots (if relevant)
![Screen_Shot_2016-08-30_at_3.35.49_PM](/uploads/35cf6372142b45b708b6757ea965c075/Screen_Shot_2016-08-30_at_3.35.49_PM.png)
See merge request !6114
|
|
prevent authored awardable thumbs votes
## What does this MR do?
This MR should prevent users from upvoting or downvoting issues/merge requests/notes authored by them.
## What are the relevant issue numbers?
Closes #20913
See merge request !5841
|
|
|
|
|
|
|
|
|
|
|
|
Drop unused CI tables and files
See merge request !6014
|
|
|
|
Add last commit time to repo view
## What does this MR do?
Adds the last commit time to the repository file view
## Are there points in the code the reviewer needs to double check?
Just need to make sure it works well in responsive (It is working well to my knowledge :smiley: )
## Why was this MR needed?
Allow users to see more information related to the last commit
## What are the relevant issue numbers?
Closes #20224
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-07-27_at_1.54.03_PM](/uploads/2b3da5c6b82965fd302abe590d2b0e46/Screen_Shot_2016-07-27_at_1.54.03_PM.png)
After:
![Screen_Shot_2016-07-27_at_1.54.09_PM](/uploads/1f5f5fe1bd6f193090067a41ac4e3c66/Screen_Shot_2016-07-27_at_1.54.09_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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)
See merge request !5530
|
|
'19721-issues-created-through-api-do-not-notify-label-subscribers' into 'master'
user is now notified when creating an issue through the api
Previously when a issue was created through our API it would not mail label subscribers, this MR aims to fix that
- [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)
Closes #19721
See merge request !5720
|
|
Add a download buttons for Build Artifacts
## What does this MR do?
This MR adds a download buttons for build artifacts of latest succesful pipeline in:
- dashboard of project,
- branches and tags views,
- and tree viewer
Implement #4255
## What are the relevant issue numbers?
Closes #4255, Closes #14419
## Screenshots
### Project main
![](/uploads/29ee2154a214416059a875f2715d4fa3/Screen_Shot_2016-08-24_at_8.00.31_PM.png)
### Branches
![](/uploads/9220c593288370986fbc1d42a1425ef7/Screen_Shot_2016-08-24_at_8.02.01_PM.png)
### Tags
![](/uploads/a843e8103221fea475a0cf9d62a1999d/Screen_Shot_2016-08-24_at_8.03.32_PM.png)
### Source Tree
![](/uploads/63cd3c8c91b6f427c166dc90d8e3c059/Screen_Shot_2016-08-24_at_8.04.56_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [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)
- [x] Download buttons
- [x] Models
- [x] Routes
- [x] Projects::ArtifactsController
- [x] API
- Tests
- Rails
- [x] Project#builds_for
- [x] branch name with slashes
- [x] only success builds
- [x] only latest builds
- [x] feature tests for download buttons
- API
- [x] branch name with slashes
- [x] only success builds
- [x] only latest builds
- [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)
See merge request !5142
|
|
Add new icon for created pipeline
## What does this MR do?
Adds new icon for `created` status
## Screenshots (if relevant)
![Screen_Shot_2016-08-30_at_11.55.02_AM](/uploads/e062f9eb3b8102374fb92ce209ab69b1/Screen_Shot_2016-08-30_at_11.55.02_AM.png)
## What are the relevant issue numbers?
Closes #21520
See merge request !6108
|
|
Shorten task status phrase
## What does this MR do?
Shortens the task status phrase to make it easier to read
## Are there points in the code the reviewer needs to double check?
Shouldn't be any
## Why was this MR needed?
Improve readability/scan-ability of the issues table
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-27_at_12.38.17_PM](/uploads/12d54e4ce24dea203e8f7189b32e3a43/Screen_Shot_2016-08-27_at_12.38.17_PM.png)
After:
![Screen_Shot_2016-08-27_at_12.38.05_PM](/uploads/7dfcc3284025b889f6afa09ca273d928/Screen_Shot_2016-08-27_at_12.38.05_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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?
Closes #21543
See merge request !6062
|
|
User can edit closed MR with deleted fork
## What does this MR do?
User can edit closed MR with deleted fork (can't change "Target branch"). When fork is deleted "Reopen" button is hidden.
## What are the relevant issue numbers?
Closes #19315
## Screenshots (if relevant)
* hidden Reopen button and information about deleted fork
![Zrzut_ekranu_2016-08-12_o_13.19.24](/uploads/d288c5625e788382e31b2979acb601df/Zrzut_ekranu_2016-08-12_o_13.19.24.png)
* editable fields for closed MR without fork
![Zrzut_ekranu_2016-08-05_o_12.24.38](/uploads/1549e54d4bc2a9939ef296ce66139706/Zrzut_ekranu_2016-08-05_o_12.24.38.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin
See merge request !5496
|
|
Fix inconsistent background color for filter input field
## What does this MR do?
Removes the background color for the filter input field for the [projects dashboard](https://gitlab.com/dashboard/projects) and [groups page](https://gitlab.com/groups/gitlab-org) to stay consistent with the other input fields
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Fixes UI inconsistency
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-29_at_11.07.28_AM](/uploads/dbd02534686a109fc98b838d2f332a42/Screen_Shot_2016-08-29_at_11.07.28_AM.png)
After:
![Screen_Shot_2016-08-29_at_11.07.38_AM](/uploads/4003a622c8568ce9c973a17c8f74557e/Screen_Shot_2016-08-29_at_11.07.38_AM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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?
Closes #21399
See merge request !6089
|
|
|
|
|
|
|
|
into 'master'
Fix diff comments on legacy MRs
## What does this MR do?
Allow diff commenting on MRs without complete diff refs. (Commenting would work before, but the JSON response would fail, so you'd only see your comment after a refresh.)
## Are there points in the code the reviewer needs to double check?
Is this really all I needed to do? I feel like there must be more to it :blush:
## Why was this MR needed?
It's a regression!
## What are the relevant issue numbers?
Closes #21211.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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)
See merge request !6029
|
|
into 'master'
Fix resolving conflicts on forks
## What does this MR do?
When we resolve conflicts, we create a merge commit in the source branch with parents `[source_branch_head, target_branch_head]`. But when the MR is from a fork, `target_branch_head` might not exist in the source repo at all, so we need to fetch it if it isn't there. We can do this locally so it should be fast.
## Are there points in the code the reviewer needs to double check?
The `TestEnv` changes are needed to reset the branch refs if we're reusing a git directory locally - otherwise, there might not be conflicts!
## Why was this MR needed?
It's a bug in a new feature!
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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?
Closes #21459.
See merge request !6082
|
|
|
|
|
|
'21446-service-external-wiki-only-works-when-project-wiki-is-enabled' into 'master'
Fix "Wiki" link not appearing in navigation for projects with external wiki
## Are there points in the code the reviewer needs to double check?
No
## What are the relevant issue numbers?
Closes #21446
## Does this MR meet the acceptance criteria?
- [x] [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
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] 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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6057
|
|
Remove vendor prefixes for linear-gradient CSS
## What does this MR do?
Removes the vendor prefixes for linear-gradient and the linear-gradient mixin since they are no longer needed with our latest and greatest browser (as per [annabeldunstone](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5762#note_14353141))
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Reduces unnecessary CSS
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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?
* Closes #21558
See merge request !6063
|
|
Add white background for no readme container
## What does this MR do?
Changes the readme container background to white so that it is more consistent with the other default pages
## Are there points in the code the reviewer needs to double check?
Check for side effects but there really shouldn't be any
## Why was this MR needed?
Improves UI
## What are the relevant issue numbers?
Closes #20906
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-18_at_4.02.15_PM](/uploads/b3e70bba4c7ecab262bb4ff76bf80d85/Screen_Shot_2016-08-18_at_4.02.15_PM.png)
After:
![Screen_Shot_2016-08-22_at_4.30.41_PM](/uploads/520f276e1ed6786f66e3eff6e579b157/Screen_Shot_2016-08-22_at_4.30.41_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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)
See merge request !5877
|
|
|
|
|
|
|
|
|
|
|
|
Add test for closed MR without fork
Add view test visibility of Reopen and Close buttons
Fix controller tests and validation method
Fix missing space
Remove unused variables from test
closed_without_fork? method refactoring
Add information about missing fork
When closed MR without fork can't edit target branch
Tests for closed MR edit view
Fix indentation and rebase, refactoring
|
|
Forks may not be up-to-date with the target project, and so might not
contain one of the parent refs in their repo. Fetch this if it isn't
present.
|
|
|
|
Closes #21139
|
|
|
|
Ensure we update dropdown label after input has been added
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687
See merge request !5999
|
|
Change logo animation to CSS
## What does this MR do?
Converts the tanuki logo animation from javascript to CSS. You can now animate the tanuki svg logo by adding the CSS Class `animate`to it.
## Are there points in the code the reviewer needs to double check?
Just need to double check for browser compatibility
## Why was this MR needed?
* Using CSS for simple animations is a best practice (Optimizes DOM, uses GPU to do animation rather than CPU)
* Happy DOM :balloon:
## What are the relevant issue numbers?
Closes #20607
## Screenshots (if relevant)
Before DOM
![8BrOJAqT4U](/uploads/705a3c7b53c45d32d435cafecfc958bd/8BrOJAqT4U.gif)
After DOM
![Screen_Shot_2016-08-03_at_10.30.08_PM](/uploads/e82d9b63501def4dc4e67a5659863680/Screen_Shot_2016-08-03_at_10.30.08_PM.png)
Before
![JnEgliIIVO](/uploads/39aaec48fd3e193f20cf455371ea2d13/JnEgliIIVO.gif)
After (Basically the same, hard to tell in my gif though because it was hard to get the timings right on the recording)
![fvLeXxmp3U](/uploads/058cf15fffed4be549af2e963eca4412/fvLeXxmp3U.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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)
See merge request !5655
|
|
Remove unused mixins
## What does this MR do?
Remove unused mixins
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Reduces unused css
## Screenshots (if relevant)
Before:
```
$git grep 'btn-big' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:107:@mixin btn-big {
$git grep 'input-big' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:97:@mixin input-big {
$git grep 'solid-shade' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
$git grep 'shade' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:41:@mixin shade {
app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
$git grep 'linear-gradient' -- '*.scss'
app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
app/assets/stylesheets/framework/mixins.scss:20:@mixin linear-gradient($from, $to) {
app/assets/stylesheets/framework/mixins.scss:22: background-image: -webkit-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:23: background-image: -moz-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:24: background-image: -ms-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:25: background-image: -o-linear-gradient($from, $to);
app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
$git grep 'border-radius-left' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:12:@mixin border-radius-left($radius) {
$git grep 'border-radius-right' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:16:@mixin border-radius-right($radius) {
```
After:
```
$git grep 'btn-big' -- '*.scss'
(nothing)
$git grep 'input-big' -- '*.scss'
(nothing)
$git grep 'solid-shade' -- '*.scss'
(nothing)
$git grep 'shade' -- '*.scss'
(nothing)
$git grep 'linear-gradient' -- '*.scss'
app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
$git grep 'border-radius-left' -- '*.scss'
(nothing)
$git grep 'border-radius-right' -- '*.scss'
(nothing)
```
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [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?
Closes #21559
See merge request !6092
|
|
Keep committing ... spinner when conflict resolved
## What does this MR do?
When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this:
![Resolve_merge_conflict](/uploads/8e0efec0bb4b1358d4dd3353ea1dc57b/Resolve_merge_conflict.gif)
I don't think this needs a CHANGELOG entry as it's pretty minor.
See merge request !5892
|
|
'21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list' into 'master'
Fixed issue where filtering one dropdown will filter another on the page
## What does this MR do?
Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
Closes #21285.
## Screenshots (if relevant)
![2016-08-24_15.59.16](/uploads/8282bd6507d10de61097956a57bd63cc/2016-08-24_15.59.16.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 [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)
Closes #21285
See merge request !5985
|
|
Add body as data-container on pipeline graph tooltip
## What does this MR do?
Fixed data tooltip getting cut off
## What are the relevant issue numbers?
Closes #21070
## Screenshots (if relevant)
![Screen_Shot_2016-08-23_at_8.45.42_AM](/uploads/87f072cfc2fdeced6161db6bec46320a/Screen_Shot_2016-08-23_at_8.45.42_AM.png)
See merge request !5955
|