diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-23 03:10:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-23 03:10:18 +0300 |
| commit | 2994a84f0137ecf313e87bd3a79f433ab615f984 (patch) | |
| tree | 082e6125a63b0e93667738637aa5e27359c85364 /app/assets | |
| parent | 6c68583a42998b0bb15971785f372197bfc55cd7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/index.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/segmented_control_button_group.vue | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 5e9b72e13cf..db1daa3ce01 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -46,6 +46,7 @@ export default () => { gl.mrWidgetData.can_create_pipeline_in_target_project, ), commitPathTemplate: gl.mrWidgetData.commit_path_template, + canAdminVulnerability: gl.mrWidgetData.can_admin_vulnerability, dismissalDescriptions, }, ...MrWidgetOptions, diff --git a/app/assets/javascripts/vue_shared/components/segmented_control_button_group.vue b/app/assets/javascripts/vue_shared/components/segmented_control_button_group.vue index e0e8200580a..fff70d003b7 100644 --- a/app/assets/javascripts/vue_shared/components/segmented_control_button_group.vue +++ b/app/assets/javascripts/vue_shared/components/segmented_control_button_group.vue @@ -43,6 +43,7 @@ export default { :key="opt.value" :disabled="!!opt.disabled" :selected="value === opt.value" + v-bind="opt.props" @click="$emit('input', opt.value)" > <slot name="button-content" v-bind="opt">{{ opt.text }}</slot> |