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:
authorMike Greiling <mike@pixelcog.com>2019-03-21 22:46:55 +0300
committerMike Greiling <mike@pixelcog.com>2019-03-21 22:46:55 +0300
commit79a45f7f02939a1c2fc1f378e43ec9b96630f918 (patch)
treeb976e8bda576d2061938bf4632218f7141947b0d /spec/javascripts/vue_shared
parentcafdf22eb4d2bb0cf84d9002dd58f40fadc5ac95 (diff)
parent3e9bb4ad314955c6d33db5d2f7dc8bab1df4e85f (diff)
Merge branch 'winh-remove-sushi' into 'master'
Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430
Diffstat (limited to 'spec/javascripts/vue_shared')
-rw-r--r--spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js
index e8b41e8eeff..852558a83bc 100644
--- a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js
+++ b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js
@@ -17,7 +17,7 @@ const DEFAULT_PROPS = {
const UserPopover = Vue.extend(userPopover);
describe('User Popover Component', () => {
- const fixtureTemplate = 'merge_requests/diff_comment.html.raw';
+ const fixtureTemplate = 'merge_requests/diff_comment.html';
preloadFixtures(fixtureTemplate);
let vm;