diff options
| author | Jose Vargas <jvargas@gitlab.com> | 2019-08-21 01:42:38 +0300 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2019-08-26 19:13:57 +0300 |
| commit | a2335c8e2197a93b27bed61c42ae450609d22f74 (patch) | |
| tree | b7faa939c00c0e4f4687584c46a7bcd98111b5f0 | |
| parent | eb724f42987a463b9d64e2b6ea7076264b43b3f3 (diff) | |
Prettify files and update locale ones
Also added changelog
| -rw-r--r-- | changelogs/unreleased/jivanvl-remove-use-prometheus-endpoint.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/javascripts/monitoring/charts/area_spec.js | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/changelogs/unreleased/jivanvl-remove-use-prometheus-endpoint.yml b/changelogs/unreleased/jivanvl-remove-use-prometheus-endpoint.yml new file mode 100644 index 00000000000..d112e9e6855 --- /dev/null +++ b/changelogs/unreleased/jivanvl-remove-use-prometheus-endpoint.yml @@ -0,0 +1,5 @@ +--- +title: Remove feature flags, use_prometheus_endpoint, additional_panel_types +merge_request: 32033 +author: +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8c8574d0a48..ff3bd5a793c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7062,9 +7062,6 @@ msgstr "" msgid "Metrics|Unexpected deployment data response from prometheus endpoint" msgstr "" -msgid "Metrics|Unexpected metrics data response from prometheus endpoint" -msgstr "" - msgid "Migrated %{success_count}/%{total_count} files." msgstr "" diff --git a/spec/javascripts/monitoring/charts/area_spec.js b/spec/javascripts/monitoring/charts/area_spec.js index 2a7473b0b95..141c7f84a7b 100644 --- a/spec/javascripts/monitoring/charts/area_spec.js +++ b/spec/javascripts/monitoring/charts/area_spec.js @@ -6,11 +6,7 @@ import Area from '~/monitoring/components/charts/area.vue'; import { createStore } from '~/monitoring/stores'; import * as types from '~/monitoring/stores/mutation_types'; import { TEST_HOST } from 'spec/test_constants'; -import { - deploymentData, - metricsGroupsAPIResponse, - mockedQueryResultPayload, -} from '../mock_data'; +import { deploymentData, metricsGroupsAPIResponse, mockedQueryResultPayload } from '../mock_data'; describe('Area component', () => { const mockSha = 'mockSha'; |