Commit c163f713 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'tr-update-grafana-placeholder' into 'master'

Remove project from grafana url placeholder

See merge request gitlab-org/gitlab!19674
parents f5fae3b0 3ed9be34
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
Icon, Icon,
}, },
data() { data() {
return { placeholderUrl: 'https://my-url.grafana.net/my-dashboard' }; return { placeholderUrl: 'https://my-url.grafana.net/' };
}, },
computed: { computed: {
...mapState(['operationsSettingsEndpoint', 'grafanaToken', 'grafanaUrl', 'grafanaEnabled']), ...mapState(['operationsSettingsEndpoint', 'grafanaToken', 'grafanaUrl', 'grafanaEnabled']),
......
...@@ -51,7 +51,7 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -51,7 +51,7 @@ exports[`grafana integration component default state to match the default snapsh
> >
<glforminput-stub <glforminput-stub
id="grafana-url" id="grafana-url"
placeholder="https://my-url.grafana.net/my-dashboard" placeholder="https://my-url.grafana.net/"
value="http://test.host" value="http://test.host"
/> />
</glformgroup-stub> </glformgroup-stub>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment