diff options
author | Sarah Yasonik <syasonik@gitlab.com> | 2019-06-07 08:48:10 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-06-07 08:48:10 +0000 |
commit | 3f5447dbbd0a939943ee12903490c264d79d6d27 (patch) | |
tree | 1026dbfbf5a286a5b7557e575f76412a0cf0a1c7 /app/assets/javascripts/monitoring | |
parent | d842d80e30000b9efa57e8e69117431b38c6784a (diff) | |
download | gitlab-ce-3f5447dbbd0a939943ee12903490c264d79d6d27.tar.gz |
Remove metrics_time_window feature flag
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/monitoring_bundle.js | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 78744c0a0a9..2314f7b80cf 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -106,10 +106,6 @@ export default { type: String, required: true, }, - showTimeWindowDropdown: { - type: Boolean, - required: true, - }, customMetricsAvailable: { type: Boolean, required: false, @@ -248,7 +244,7 @@ export default { > </gl-dropdown> </div> - <div v-if="showTimeWindowDropdown" class="d-flex align-items-center prepend-left-8"> + <div class="d-flex align-items-center prepend-left-8"> <strong>{{ s__('Metrics|Show last') }}</strong> <gl-dropdown class="prepend-left-10 js-time-window-dropdown" diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js index 57771ccf4d9..62c0f44c1e6 100644 --- a/app/assets/javascripts/monitoring/monitoring_bundle.js +++ b/app/assets/javascripts/monitoring/monitoring_bundle.js @@ -16,7 +16,6 @@ export default (props = {}) => { props: { ...el.dataset, hasMetrics: parseBoolean(el.dataset.hasMetrics), - showTimeWindowDropdown: gon.features.metricsTimeWindow, ...props, }, }); |