diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
| commit | 3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0 (patch) | |
| tree | 8b029adbe769e0c082f2e83ba831ba065648dbb4 /app/assets/javascripts/label_manager.js | |
| parent | 7e36fa398b6f2e0304d852b7c77ef30d83e62ed4 (diff) | |
| parent | 7eb2f184e6a74c84a58ba07d78d2bcaab764a42d (diff) | |
| download | gitlab-ce-3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0.tar.gz | |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'app/assets/javascripts/label_manager.js')
| -rw-r--r-- | app/assets/javascripts/label_manager.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/label_manager.js b/app/assets/javascripts/label_manager.js index 06023e98ec3..8b01024b7d4 100644 --- a/app/assets/javascripts/label_manager.js +++ b/app/assets/javascripts/label_manager.js @@ -1,7 +1,7 @@ /* eslint-disable comma-dangle, class-methods-use-this, no-underscore-dangle, no-param-reassign, no-unused-vars, consistent-return, func-names, space-before-function-paren, max-len */ import $ from 'jquery'; -import Sortable from 'vendor/Sortable'; +import Sortable from 'sortablejs'; import flash from './flash'; import axios from './lib/utils/axios_utils'; |