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/settings_panels_spec.js | |
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/settings_panels_spec.js')
-rw-r--r-- | spec/javascripts/settings_panels_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/settings_panels_spec.js b/spec/javascripts/settings_panels_spec.js index 3b681a9ff28..2c5d91a45bc 100644 --- a/spec/javascripts/settings_panels_spec.js +++ b/spec/javascripts/settings_panels_spec.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import initSettingsPanels from '~/settings_panels'; describe('Settings Panels', () => { - preloadFixtures('groups/edit.html.raw'); + preloadFixtures('groups/edit.html'); beforeEach(() => { - loadFixtures('groups/edit.html.raw'); + loadFixtures('groups/edit.html'); }); describe('initSettingsPane', () => { |