diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-01 10:57:37 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-05 19:05:39 -0500 |
commit | 4f4fa293d4b6bde271a8d2c585484b2e212ed43d (patch) | |
tree | 0ea64819f57546d703c67b181b07959b94670424 | |
parent | f6af87fb5f355247e14ef4d23db923fe4e7bbcc5 (diff) | |
download | gitlab-ce-4f4fa293d4b6bde271a8d2c585484b2e212ed43d.tar.gz |
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
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 25ef0a35d54..a89978a0b52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -105,6 +105,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 - Don't create groups for unallowed users when importing projects - Scope webhooks/services that will run for confidential issues diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 7d507c7a1c9..d8034e8b7a0 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -199,6 +199,7 @@ break; case 'labels': switch (path[2]) { + case 'new': case 'edit': new Labels(); } |