diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 10:03:16 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 10:03:16 +0100 |
| commit | d5789d4e2396716783520a695f756a58c3788175 (patch) | |
| tree | b7f6f03e0ce0a354ec098e597f3c17dfde874fe9 /spec/javascripts/merge_request_tabs_spec.js | |
| parent | 077298817fe59b5e572b17a6ecd6ffb2c47fd9b5 (diff) | |
| parent | 5ae91f323d054341c0d012de85835ef40f1bf9f8 (diff) | |
| download | gitlab-ce-d5789d4e2396716783520a695f756a58c3788175.tar.gz | |
Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections
* master: (211 commits)
Diffstat (limited to 'spec/javascripts/merge_request_tabs_spec.js')
| -rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index fda24db98b4..79c8cf0ba32 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -1,4 +1,6 @@ /* eslint-disable no-var, comma-dangle, object-shorthand */ + +import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import * as urlUtils from '~/lib/utils/url_utility'; |