diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-22 14:58:23 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-26 02:42:13 -0500 |
| commit | 733eec88e4c397c590165c7acd437c1889b38119 (patch) | |
| tree | d820e332fe97f54185a03ca2dd6cbd41e42832a8 /app/assets/javascripts/dispatcher.js | |
| parent | 8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3 (diff) | |
| download | gitlab-ce-733eec88e4c397c590165c7acd437c1889b38119.tar.gz | |
Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ce
Backport Fix locked milestone in boards being remove-able.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433
Conflicts:
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/filtered_search_boards.js
app/assets/javascripts/filtered_search/filtered_search_manager.js
spec/features/boards/boards_spec.rb
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index c5fffea8bb0..6e2f06112dd 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -124,7 +124,8 @@ import ShortcutsBlob from './shortcuts_blob'; case 'projects:merge_requests:index': case 'projects:issues:index': if (gl.FilteredSearchManager && document.querySelector('.filtered-search')) { - new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests'); + const filteredSearchManager = new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests'); + filteredSearchManager.setup(); } Issuable.init(); new gl.IssuableBulkActions({ |