diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-22 11:03:15 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-22 11:03:15 +0000 |
| commit | 022968764ced43c5de0c3291cfe2fbc7b068e944 (patch) | |
| tree | f8e35bc8b582ecabb7d0b8e559c652fe0ede8262 /spec/javascripts/vue_mr_widget/components | |
| parent | 685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b (diff) | |
| download | gitlab-ce-022968764ced43c5de0c3291cfe2fbc7b068e944.tar.gz | |
Revert "Merge branch 'winh-remove-sushi' into 'master'"
This reverts merge request !26430
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 368c997d318..30659ad16f3 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -415,7 +415,7 @@ describe('ReadyToMerge', () => { }); beforeEach(() => { - loadFixtures('merge_requests/merge_request_of_current_user.html'); + loadFixtures('merge_requests/merge_request_of_current_user.html.raw'); }); it('should call start and stop polling when MR merged', done => { |