diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-01 21:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-01 21:09:44 +0300 |
commit | 0f295cd16f516ec10e6cd0b3fa5846563c08d9b8 (patch) | |
tree | 1b1547e87fee6fa9ce7fad3f6e09bf42e8ba4f0f /app/assets | |
parent | 63fc59f6fdf8c61e7e342f89aecaf565b645960d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/boards/components/board_add_new_column.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/constants.js | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_add_new_column.vue b/app/assets/javascripts/boards/components/board_add_new_column.vue index 22ad619e76b..c5411ec313a 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column.vue @@ -52,6 +52,8 @@ export default { }, setSelectedItem(selectedId) { + this.selectedId = selectedId; + const label = this.labels.find(({ id }) => id === selectedId); if (!selectedId || !label) { this.selectedLabel = null; @@ -87,8 +89,8 @@ export default { <template #items> <gl-form-radio-group v-if="labels.length > 0" - v-model="selectedId" class="gl-overflow-y-auto gl-px-5 gl-pt-3" + :checked="selectedId" @change="setSelectedItem" > <label diff --git a/app/assets/javascripts/vue_merge_request_widget/constants.js b/app/assets/javascripts/vue_merge_request_widget/constants.js index 284c18b3fbd..297e0cfa363 100644 --- a/app/assets/javascripts/vue_merge_request_widget/constants.js +++ b/app/assets/javascripts/vue_merge_request_widget/constants.js @@ -99,6 +99,12 @@ export const EXTENSION_ICONS = { neutral: 'neutral', error: 'error', notice: 'notice', + severityCritical: 'severityCritical', + severityHigh: 'severityHigh', + severityMedium: 'severityMedium', + severityLow: 'severityLow', + severityInfo: 'severityInfo', + severityUnknown: 'severityUnknown', }; export const EXTENSION_ICON_NAMES = { @@ -108,6 +114,12 @@ export const EXTENSION_ICON_NAMES = { neutral: 'status-neutral', error: 'status-alert', notice: 'status-alert', + severityCritical: 'severity-critical', + severityHigh: 'severity-high', + severityMedium: 'severity-medium', + severityLow: 'severity-low', + severityInfo: 'severity-info', + severityUnknown: 'severity-unknown', }; export const EXTENSION_ICON_CLASS = { @@ -117,6 +129,12 @@ export const EXTENSION_ICON_CLASS = { neutral: 'gl-text-gray-400', error: 'gl-text-red-500', notice: 'gl-text-gray-500', + severityCritical: 'gl-text-red-800', + severityHigh: 'gl-text-red-600', + severityMedium: 'gl-text-orange-400', + severityLow: 'gl-text-orange-300', + severityInfo: 'gl-text-blue-400', + severityUnknown: 'gl-text-gray-400', }; export { STATE_MACHINE }; |