diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-28 09:34:18 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-28 09:34:18 +0000 |
| commit | b623c9185678a7b79418f28c57dd457cbe2fbdea (patch) | |
| tree | 1ae288e4b4dba93e8ff71d5360e8628069d7b8af /app | |
| parent | bd268a1e0924ce912ef8bf13373820640b5b53c0 (diff) | |
| parent | 485b5beb2f74f56f90f168e68404524a21ac0b2d (diff) | |
| download | gitlab-ce-b623c9185678a7b79418f28c57dd457cbe2fbdea.tar.gz | |
Merge branch 'allow_collaboration_status_work' into 'master'
Update condition to visibility collaboration status text, #44642.
Closes #44642
See merge request gitlab-org/gitlab-ce!23104
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 5 |
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 d8a75388e84..b7f12076958 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 @@ -106,6 +106,9 @@ export default { (!this.mr.isNothingToMergeState && !this.mr.isMergedState) ); }, + shouldRenderCollaborationStatus() { + return this.mr.allowCollaboration && this.mr.isOpen; + }, shouldRenderMergedPipeline() { return this.mr.state === 'merged' && !_.isEmpty(this.mr.mergePipeline); }, @@ -315,7 +318,7 @@ export default { <div class="mr-widget-section"> <component :is="componentName" :mr="mr" :service="service" /> - <section v-if="mr.allowCollaboration" class="mr-info-list mr-links"> + <section v-if="shouldRenderCollaborationStatus" class="mr-info-list mr-links"> {{ s__('mrWidget|Allows commits from members who can merge to the target branch') }} </section> |