summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
diff options
context:
space:
mode:
authorSimon Knox <simon@gitlab.com>2018-11-19 07:06:38 +0000
committerKushal Pandya <kushalspandya@gmail.com>2018-11-19 07:06:38 +0000
commitdfd1d6c4c94885dca79e9d95f5634f2332006c2f (patch)
treea3a32be528daa64d3f9eb9bc2c9c23099e6d8030 /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
parent8dd89f03061aa646bcda5055fa96376fb9e30759 (diff)
downloadgitlab-ce-dfd1d6c4c94885dca79e9d95f5634f2332006c2f.tar.gz
Don't show memory usage graph for unmerged MRs
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue2
1 files changed, 2 insertions, 0 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 063d1e15544..3b840540657 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
@@ -312,6 +312,7 @@ export default {
:key="`pre-merge-deploy-${deployment.id}`"
class="js-pre-merge-deploy"
:deployment="deployment"
+ :show-metrics="false"
/>
<div class="mr-section-container">
<grouped-test-reports-app
@@ -366,6 +367,7 @@ export default {
v-for="postMergeDeployment in mr.postMergeDeployments"
:key="`post-merge-deploy-${postMergeDeployment.id}`"
:deployment="postMergeDeployment"
+ :show-metrics="true"
class="js-post-deployment"
/>
</template>