diff options
| author | Simon Knox <simon@gitlab.com> | 2018-11-19 07:06:38 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-11-19 07:06:38 +0000 |
| commit | dfd1d6c4c94885dca79e9d95f5634f2332006c2f (patch) | |
| tree | a3a32be528daa64d3f9eb9bc2c9c23099e6d8030 /app/assets | |
| parent | 8dd89f03061aa646bcda5055fa96376fb9e30759 (diff) | |
| download | gitlab-ce-dfd1d6c4c94885dca79e9d95f5634f2332006c2f.tar.gz | |
Don't show memory usage graph for unmerged MRs
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index 4ec925aa8a6..fe741dc60cb 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -33,6 +33,10 @@ export default { type: Object, required: true, }, + showMetrics: { + type: Boolean, + required: true, + }, }, deployedTextMap: { running: __('Deploying to'), @@ -74,6 +78,9 @@ export default { shouldRenderDropdown() { return this.deployment.changes && this.deployment.changes.length > 0; }, + showMemoryUsage() { + return this.hasMetrics && this.showMetrics; + }, }, methods: { stopEnvironment() { @@ -136,7 +143,7 @@ export default { {{ deployTimeago }} </span> <memory-usage - v-if="hasMetrics" + v-if="showMemoryUsage" :metrics-url="deployment.metrics_url" :metrics-monitoring-url="deployment.metrics_monitoring_url" /> 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> |