diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-17 08:27:42 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-17 08:27:42 +0000 |
commit | 74b26c7ccab2715b963124936b80c483889fce37 (patch) | |
tree | 92c0a9f0ae5627d2c6b53cb75f539ed2a5343312 | |
parent | ad521bde1bb556709edd39d8a9aa67ee47605b91 (diff) | |
parent | 2df01cca72a7e343ca6ebe90e47f4568a26d8fd2 (diff) | |
download | gitlab-ce-74b26c7ccab2715b963124936b80c483889fce37.tar.gz |
Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'
Changed utilites imports from ~ to relative paths
Closes #33485
See merge request !12026
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js | 4 | ||||
-rw-r--r-- | changelogs/unreleased/mr-widget-memory-usage-tech-debt-fix.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js index 8155218681c..76cb71b6c12 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js @@ -1,5 +1,5 @@ -import statusCodes from '~/lib/utils/http_status'; -import { bytesToMiB } from '~/lib/utils/number_utils'; +import statusCodes from '../../lib/utils/http_status'; +import { bytesToMiB } from '../../lib/utils/number_utils'; import MemoryGraph from '../../vue_shared/components/memory_graph'; import MRWidgetService from '../services/mr_widget_service'; diff --git a/changelogs/unreleased/mr-widget-memory-usage-tech-debt-fix.yml b/changelogs/unreleased/mr-widget-memory-usage-tech-debt-fix.yml new file mode 100644 index 00000000000..14b5493a246 --- /dev/null +++ b/changelogs/unreleased/mr-widget-memory-usage-tech-debt-fix.yml @@ -0,0 +1,4 @@ +--- +title: Changed utilities imports from ~ to relative paths +merge_request: +author: |