diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-26 19:03:28 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-26 19:03:28 +0300 |
| commit | ad985a7a28c19a085011afc7531f4f2c13783cb2 (patch) | |
| tree | 56546845700e6551628d6ad79d46b74901a25460 /spec/javascripts/vue_shared | |
| parent | 02b29ce8846760ac91ec560d737a38497a5b9155 (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
(cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
Diffstat (limited to 'spec/javascripts/vue_shared')
| -rw-r--r-- | spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js | 2 |
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; |