diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-01 10:57:37 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-01 10:57:37 +0000 |
commit | 313b09fcbbef8ccccb43bf37320e14f59a631fdb (patch) | |
tree | 6022140772aa29ba186ce4ef28564d35f3462d3f /app | |
parent | 433d8a10c1d1259a61e59a8368db08d7d6b58c62 (diff) | |
parent | fdbab40d94b690bdc1890f027a89653924fa6710 (diff) | |
download | gitlab-ce-313b09fcbbef8ccccb43bf37320e14f59a631fdb.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

* After

## 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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index ba64d2bcf0b..38cdc7b9fba 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(); } |