diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-26 17:37:06 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-26 17:37:06 +0300 |
| commit | a36a7f5d9ca1cfc33801ea0b869359dc7243065b (patch) | |
| tree | 5e7202215cd5313d65a0924fe4f3731a0bbb7ecd /app | |
| parent | b0c8de1f4f0852f769d4382e0e2d04ab82d239cc (diff) | |
| parent | 9f2e5742902bbc41e941be11a4218a6e2b2fdd5a (diff) | |
Merge branch '12364-sortable-default-mixin' into 'master'
Removes EE differences for sortable_default_options
Closes gitlab-ee#12364
See merge request gitlab-org/gitlab-ce!30074
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/mixins/sortable_default_options.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js b/app/assets/javascripts/boards/mixins/sortable_default_options.js index 983b28d2e67..636ca99952c 100644 --- a/app/assets/javascripts/boards/mixins/sortable_default_options.js +++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js @@ -1,7 +1,7 @@ /* global DocumentTouch */ import $ from 'jquery'; -import sortableConfig from '../../sortable/sortable_config'; +import sortableConfig from 'ee_else_ce/sortable/sortable_config'; export function sortableStart() { $('.has-tooltip') |