summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-07-16 17:27:30 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-07-16 17:27:30 +0000
commitc82adcce6b21272d3d9c8cee541ed03e60e65439 (patch)
tree159fc1e4ac5748089ab381d4418358dcd6a57e8c
parent907dccddeb658ddad808dc6ebc3e219b6e1d223b (diff)
parent550152d82e3ce4f87b48a3b4e9d294bcc50f7fc4 (diff)
downloadgitlab-ce-c82adcce6b21272d3d9c8cee541ed03e60e65439.tar.gz
Merge branch '49291-fix-memory-graph-component-typo' into 'master'
Fix typo in CSS transform property for Memory Graph component Closes #49291 See merge request gitlab-org/gitlab-ce!20650
-rw-r--r--app/assets/javascripts/vue_shared/components/memory_graph.vue2
-rw-r--r--changelogs/unreleased/49291-fix-memory-graph-component-typo.yml5
-rw-r--r--spec/javascripts/vue_shared/components/memory_graph_spec.js2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/memory_graph.vue b/app/assets/javascripts/vue_shared/components/memory_graph.vue
index 522091ea889..552a92541be 100644
--- a/app/assets/javascripts/vue_shared/components/memory_graph.vue
+++ b/app/assets/javascripts/vue_shared/components/memory_graph.vue
@@ -126,7 +126,7 @@ export default {
:cx="dotX"
:cy="dotY"
r="1.5"
- tranform="translate(0 -1)"
+ transform="translate(0 -1)"
/>
</svg>
</div>
diff --git a/changelogs/unreleased/49291-fix-memory-graph-component-typo.yml b/changelogs/unreleased/49291-fix-memory-graph-component-typo.yml
new file mode 100644
index 00000000000..f21bd454e84
--- /dev/null
+++ b/changelogs/unreleased/49291-fix-memory-graph-component-typo.yml
@@ -0,0 +1,5 @@
+---
+title: Fix typo in CSS transform property for Memory Graph component
+merge_request: 20650
+author:
+type: fixed
diff --git a/spec/javascripts/vue_shared/components/memory_graph_spec.js b/spec/javascripts/vue_shared/components/memory_graph_spec.js
index 73a69df019e..65d8ed39ade 100644
--- a/spec/javascripts/vue_shared/components/memory_graph_spec.js
+++ b/spec/javascripts/vue_shared/components/memory_graph_spec.js
@@ -113,7 +113,7 @@ describe('MemoryGraph', () => {
const circleEl = el.querySelector('circle');
expect(circleEl).toBeDefined();
expect(circleEl.getAttribute('r')).toBe('1.5');
- expect(circleEl.getAttribute('tranform')).toBe('translate(0 -1)');
+ expect(circleEl.getAttribute('transform')).toBe('translate(0 -1)');
expect(circleEl.getAttribute('cx')).toBe(`${dotX}`);
expect(circleEl.getAttribute('cy')).toBe(`${dotY}`);
done();