summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 00:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 00:09:06 +0000
commit7a84f32e221939059ad4e34c7fecf3633f9ee448 (patch)
tree49392b3e7f57a3e73c1adf28a4085b35328d09bc /app/assets/javascripts/vue_merge_request_widget
parentdf40cd1c38116a25089930be960d511b0be732ad (diff)
downloadgitlab-ce-7a84f32e221939059ad4e34c7fecf3633f9ee448.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, 1 insertions, 4 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 190d790f584..f66c79ac567 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
@@ -155,10 +155,7 @@ export default {
},
shouldSuggestPipelines() {
return (
- gon.features?.suggestPipeline &&
- !this.mr.hasCI &&
- this.mr.mergeRequestAddCiConfigPath &&
- !this.mr.isDismissedSuggestPipeline
+ !this.mr.hasCI && this.mr.mergeRequestAddCiConfigPath && !this.mr.isDismissedSuggestPipeline
);
},
shouldRenderCodeQuality() {