diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-02-07 12:43:43 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-02-07 12:43:43 +0300 |
| commit | 6e51960788f8a431f86b169d648c4cba68c717ae (patch) | |
| tree | 57cda592fba01fa1c8e39819b263f32d600e1048 /app | |
| parent | 81597427d06e319e67eabd471313c90bb0f76300 (diff) | |
| parent | b1257951daf8b35b61781fb3317d8adfe0356adb (diff) | |
Merge branch 'ee-8346-hide-unlicensed-alerts' into 'master'
Backport to resolve conflicts for gitlab-ee!9224
See merge request gitlab-org/gitlab-ce!24889
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/environments/metrics/index.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 9c5fd93f7d1..895a57785bc 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -160,7 +160,8 @@ export default { {{ s__('Metrics|Environment') }} <div class="dropdown prepend-left-10"> <button class="dropdown-menu-toggle" data-toggle="dropdown" type="button"> - <span> {{ currentEnvironmentName }} </span> <icon name="chevron-down" /> + <span>{{ currentEnvironmentName }}</span> + <icon name="chevron-down" /> </button> <div v-if="store.environmentsData.length > 0" @@ -172,9 +173,8 @@ export default { :href="environment.metrics_path" :class="{ 'is-active': environment.name == currentEnvironmentName }" class="dropdown-item" + >{{ environment.name }}</a > - {{ environment.name }} - </a> </li> </ul> </div> diff --git a/app/assets/javascripts/pages/projects/environments/metrics/index.js b/app/assets/javascripts/pages/projects/environments/metrics/index.js index 0b644780ad4..0d69a689316 100644 --- a/app/assets/javascripts/pages/projects/environments/metrics/index.js +++ b/app/assets/javascripts/pages/projects/environments/metrics/index.js @@ -1,3 +1,3 @@ -import monitoringBundle from '~/monitoring/monitoring_bundle'; +import monitoringBundle from 'ee_else_ce/monitoring/monitoring_bundle'; document.addEventListener('DOMContentLoaded', monitoringBundle); |