diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 19:35:45 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 19:35:45 +0000 |
| commit | c2a8daf9928439114ed4125577d376b76460d023 (patch) | |
| tree | e61ec1e8480f5e51c779c310788ef401efb47fcd /spec/javascripts | |
| parent | 60bc0fc16900316ff22b83c6de3b358767d838b9 (diff) | |
| parent | 1e39b51a8a32ea469838fc473d41c8b04c2f935a (diff) | |
| download | gitlab-ce-c2a8daf9928439114ed4125577d376b76460d023.tar.gz | |
Merge branch '15664-remove-jquery-nicescroll' into 'master'
Resolve "Remove jQuery Nicescroll"
Closes #15664, #30860, and #35885
See merge request !13262
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/build_spec.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/labels_issue_sidebar_spec.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/spec/javascripts/build_spec.js b/spec/javascripts/build_spec.js index be90dbdd88a..35149611095 100644 --- a/spec/javascripts/build_spec.js +++ b/spec/javascripts/build_spec.js @@ -5,7 +5,6 @@ import '~/lib/utils/datetime_utility'; import '~/lib/utils/url_utility'; import '~/build'; import '~/breakpoints'; -import 'vendor/jquery.nicescroll'; describe('Build', () => { const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/-/jobs/1`; diff --git a/spec/javascripts/labels_issue_sidebar_spec.js b/spec/javascripts/labels_issue_sidebar_spec.js index c99f379b871..e47adc49224 100644 --- a/spec/javascripts/labels_issue_sidebar_spec.js +++ b/spec/javascripts/labels_issue_sidebar_spec.js @@ -4,7 +4,6 @@ import '~/gl_dropdown'; import 'select2'; -import 'vendor/jquery.nicescroll'; import '~/api'; import '~/create_label'; import '~/issuable_context'; |