diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-17 00:38:31 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-17 00:38:31 +0000 |
| commit | 1b338d59f641ce629cbecb839b64c9fd65561276 (patch) | |
| tree | 553665c1a24e4a264db52eee3b366fb4e7000d28 /.scss-lint.yml | |
| parent | 07189d7aed52e784adf4d625d94838b44668b28e (diff) | |
| parent | 5dffd21cd526fadc3daa041fe88b60388dc786ed (diff) | |
| download | gitlab-ce-1b338d59f641ce629cbecb839b64c9fd65561276.tar.gz | |
Merge branch 'label-flash' into 'master'
Fix error message for existing labels in right sidebar.
## What does this MR do?
Fixes flash notification in right sidebar, if we want to create an existing label.
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Because it was broken.
## What are the relevant issue numbers?
Fixes #20117
## Screenshots (if relevant)
#### Before
#### After
## 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
- [ ] ~~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 !5546
Diffstat (limited to '.scss-lint.yml')
0 files changed, 0 insertions, 0 deletions