Commit 313b09fc authored by Fatih Acet's avatar Fatih Acet
Browse files

Merge branch 'fix-suggested-colors-options-for-new-labels-in-the-admin-area' into 'master'

Fix suggested colors options for new labels in the admin area

## What does this MR do?

Execute the JS related to the suggested colors options when user access the new label in the admin area.

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

No.

## Why was this MR needed?

Clicking in a suggested color when creating a new label in the admin area don't change the background color.

## Screenshots (if relevant)

* Before

    ![2016-08-31_19.56.14](/uploads/3d50236dac578910c5062aa1e83da350/2016-08-31_19.56.14.gif)

* After

    ![2016-08-31_19.58.59](/uploads/376ffdcbb5b80ef51ab1d642fe9486d0/2016-08-31_19.58.59.gif)

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [ ] 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)

## What are the relevant issue numbers?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21726

See merge request !6138
......@@ -66,6 +66,7 @@ v 8.11.4 (unreleased)
- Fix sorting issues by "last updated" doesn't work after import from GitHub
- GitHub importer use default project visibility for non-private projects
- Creating an issue through our API now emails label subscribers !5720
- Fix suggested colors options for new labels in the admin area
- Block concurrent updates for Pipeline
- Fix resolving conflicts on forks
- Fix diff commenting on merge requests created prior to 8.10
......
......@@ -199,6 +199,7 @@
break;
case 'labels':
switch (path[2]) {
case 'new':
case 'edit':
new Labels();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment