diff options
| author | Dhiraj Bodicherla <dhiraj@gitlab.com> | 2019-06-12 16:05:04 -0700 |
|---|---|---|
| committer | Dhiraj Bodicherla <dhiraj@gitlab.com> | 2019-06-12 16:50:07 -0700 |
| commit | a0f5233f05e43f17bf68da4bd1fd952a0326b0bf (patch) | |
| tree | 960028b015c42239626e75463b7465d32756e64d | |
| parent | 617e817bf64f3b9ba93722d0fb4ac98c19c2cef9 (diff) | |
| download | gitlab-ce-dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard.tar.gz | |
Fixed prettier issue and failing testsdhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard
| -rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 14 | ||||
| -rw-r--r-- | spec/helpers/environments_helper_spec.rb | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 7e1dcc78ec0..0a652329dfe 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -253,7 +253,8 @@ export default { :key="environment.id" :active="environment.name === currentEnvironmentName" active-class="is-active" - >{{ environment.name }}</gl-dropdown-item> + >{{ environment.name }}</gl-dropdown-item + > </gl-dropdown> </div> <div class="d-flex align-items-center prepend-left-8"> @@ -269,7 +270,8 @@ export default { :active="activeTimeWindow(key)" :href="setTimeWindowParameter(key)" active-class="active" - >{{ value }}</gl-dropdown-item> + >{{ value }}</gl-dropdown-item + > </gl-dropdown> </div> </div> @@ -278,7 +280,8 @@ export default { <gl-button v-gl-modal-directive="$options.addMetric.modalId" class="js-add-metric-button text-success border-success" - >{{ $options.addMetric.title }}</gl-button> + >{{ $options.addMetric.title }}</gl-button + > <gl-modal ref="addMetricModal" :modal-id="$options.addMetric.modalId" @@ -297,7 +300,8 @@ export default { :disabled="!formIsValid" variant="success" @click="submitCustomMetricsForm" - >{{ __('Save changes') }}</gl-button> + >{{ __('Save changes') }}</gl-button + > </div> </gl-modal> </div> @@ -309,7 +313,7 @@ export default { target="_blank" > {{ __('View full dashboard') }} - <icon name="external-link"/> + <icon name="external-link" /> </gl-button> </div> </div> diff --git a/spec/helpers/environments_helper_spec.rb b/spec/helpers/environments_helper_spec.rb index 0c8a8d2f032..2b8bf9319fc 100644 --- a/spec/helpers/environments_helper_spec.rb +++ b/spec/helpers/environments_helper_spec.rb @@ -27,7 +27,7 @@ describe EnvironmentsHelper do 'empty-no-data-svg-path' => match_asset_path('/assets/illustrations/monitoring/no_data.svg'), 'empty-unable-to-connect-svg-path' => match_asset_path('/assets/illustrations/monitoring/unable_to_connect.svg'), 'metrics-endpoint' => additional_metrics_project_environment_path(project, environment, format: :json), - 'deployment-endpoint' => project_environment_deployments_path(project, environment, format: :json), + 'deployments-endpoint' => project_environment_deployments_path(project, environment, format: :json), 'environments-endpoint': project_environments_path(project, format: :json), 'project-path' => project_path(project), 'tags-path' => project_tags_path(project), |