diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
| commit | aa1874fbf8795677e53797205cb65b6f4fb83d4c (patch) | |
| tree | 85a5cfb6bdac803258df8e2df09a50169468996a /spec/javascripts/merge_request_spec.js | |
| parent | 3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff) | |
| parent | 82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff) | |
| download | gitlab-ce-move-gl-dropdown.tar.gz | |
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
Diffstat (limited to 'spec/javascripts/merge_request_spec.js')
| -rw-r--r-- | spec/javascripts/merge_request_spec.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index 70ae63ba036..2f02c11482f 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-return-assign */ -/* global MergeRequest */ -import '~/merge_request'; +import MergeRequest from '~/merge_request'; import CloseReopenReportToggle from '~/close_reopen_report_toggle'; import IssuablesHelper from '~/helpers/issuables_helper'; |