summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-09 03:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-09 03:09:24 +0000
commita25cab22f84ee674ebb32625a6da566acd454e8a (patch)
treef52667dd7f61cace3157fd55c1485cc2becbe3e3 /app/assets/javascripts/vue_merge_request_widget
parent77914793a349059bf523b131fc925b34349d6884 (diff)
downloadgitlab-ce-a25cab22f84ee674ebb32625a6da566acd454e8a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index d121daf0aa7..bb4b66009de 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -197,6 +197,9 @@ export default {
shouldShowAccessibilityReport() {
return this.mr.accessibilityReportPath;
},
+ formattedHumanAccess() {
+ return (this.mr.humanAccess || '').toLowerCase();
+ },
},
watch: {
state(newVal, oldVal) {
@@ -434,7 +437,7 @@ export default {
class="mr-widget-workflow"
:pipeline-path="mr.mergeRequestAddCiConfigPath"
:pipeline-svg-path="mr.pipelinesEmptySvgPath"
- :human-access="mr.humanAccess.toLowerCase()"
+ :human-access="formattedHumanAccess"
:user-callouts-path="mr.userCalloutsPath"
:user-callout-feature-id="mr.suggestPipelineFeatureId"
@dismiss="dismissSuggestPipelines"