Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Read <tread@gitlab.com>2019-07-11 15:35:24 +0300
committerTristan Read <tread@gitlab.com>2019-07-16 23:53:42 +0300
commitb5216395e5ac06d150c91ccf80f149b7021bbacd (patch)
tree0731c5b05e35519f45c6ed708d11711d7227c831
parentb5a0fbae66bff1292685c94d53adcb0814d71bc8 (diff)
Rename link variable
-rw-r--r--app/assets/javascripts/behaviors/markdown/render_metrics.js4
-rw-r--r--app/assets/javascripts/monitoring/components/embed.vue4
-rw-r--r--spec/frontend/monitoring/embed/embed_spec.js2
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_metrics.js b/app/assets/javascripts/behaviors/markdown/render_metrics.js
index eb198dc0c2e..cf1431ca688 100644
--- a/app/assets/javascripts/behaviors/markdown/render_metrics.js
+++ b/app/assets/javascripts/behaviors/markdown/render_metrics.js
@@ -9,14 +9,14 @@ export default function renderMetrics(elements) {
}
elements.forEach(element => {
- const link = element.dataset.dashboardUrl;
+ const { dashboardUrl } = element.dataset;
const MetricsComponent = Vue.extend(Metrics);
const renderedComponent = new MetricsComponent({
el: element,
store: createStore(),
propsData: {
- link,
+ dashboardUrl,
},
});
diff --git a/app/assets/javascripts/monitoring/components/embed.vue b/app/assets/javascripts/monitoring/components/embed.vue
index 442145725cf..c05f8d8cead 100644
--- a/app/assets/javascripts/monitoring/components/embed.vue
+++ b/app/assets/javascripts/monitoring/components/embed.vue
@@ -14,7 +14,7 @@ export default {
MonitorAreaChart,
},
props: {
- link: {
+ dashboardUrl: {
type: String,
required: true,
},
@@ -42,7 +42,7 @@ export default {
prometheusEndpointEnabled: true,
});
this.setEndpoints({
- dashboardEndpoint: this.link,
+ dashboardEndpoint: this.dashboardUrl,
});
this.setShowErrorBanner(false);
this.$nextTick(() => {
diff --git a/spec/frontend/monitoring/embed/embed_spec.js b/spec/frontend/monitoring/embed/embed_spec.js
index 60aaa8fa62f..3b18a0f77c7 100644
--- a/spec/frontend/monitoring/embed/embed_spec.js
+++ b/spec/frontend/monitoring/embed/embed_spec.js
@@ -18,7 +18,7 @@ describe('Embed', () => {
localVue,
store,
propsData: {
- link: TEST_HOST,
+ dashboardUrl: TEST_HOST,
},
});
}