Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-07 15:09:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-07 15:09:00 +0300
commitba27dbddc7dbc42f2cc8d84e815a9ea19f87a81d (patch)
treee71fba864897fa78be7f0c40ded23d0f719abf84 /app/assets/javascripts/labels
parent708815aefead73a61473c1a611aea169ab16a358 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/labels')
-rw-r--r--app/assets/javascripts/labels/components/promote_label_modal.vue9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels/components/promote_label_modal.vue b/app/assets/javascripts/labels/components/promote_label_modal.vue
index 298cc20ab35..752fda83d6b 100644
--- a/app/assets/javascripts/labels/components/promote_label_modal.vue
+++ b/app/assets/javascripts/labels/components/promote_label_modal.vue
@@ -4,6 +4,7 @@ import { createAlert } from '~/alert';
import axios from '~/lib/utils/axios_utils';
import { visitUrl } from '~/lib/utils/url_utility';
import { s__, __, sprintf } from '~/locale';
+import { stripQuotes } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
import eventHub from '../event_hub';
export default {
@@ -52,6 +53,12 @@ export default {
},
);
},
+ cleanedLabelColor() {
+ return stripQuotes(this.labelColor);
+ },
+ cleanedLabelTextColor() {
+ return stripQuotes(this.labelTextColor);
+ },
},
methods: {
onSubmit() {
@@ -97,7 +104,7 @@ export default {
<template #labelTitle>
<span
class="label color-label"
- :style="`background-color: ${labelColor}; color: ${labelTextColor};`"
+ :style="`background-color: ${cleanedLabelColor}; color: ${cleanedLabelTextColor};`"
>
{{ labelTitle }}
</span>