diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-26 11:13:35 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-26 11:13:35 +0100 |
| commit | 425dbdd222244bc00cab8c2dbd6bb94233d11a15 (patch) | |
| tree | bb6c5bb6072b9fb6625e83f4be1d8a5beef95ff7 | |
| parent | 887227e0371858d5d048f61bfe0700e4b7ebab58 (diff) | |
| download | gitlab-ce-425dbdd222244bc00cab8c2dbd6bb94233d11a15.tar.gz | |
fixed label subscription & merge conflicts
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/init_legacy_filters.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 0b2c7e434f0..bab2d59e67f 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -263,7 +263,6 @@ import initIssuableSidebar from './init_issuable_sidebar'; new ZenMode(); new gl.GLForm($('.release-form'), true); break; - case 'projects:merge_requests:conflicts:show': case 'projects:merge_requests:show': new gl.Diff(); shortcut_handler = new ShortcutsIssuable(true); @@ -381,7 +380,15 @@ import initIssuableSidebar from './init_issuable_sidebar'; if ($('.prioritized-labels').length) { new gl.LabelManager(); } - new gl.ProjectLabelSubscription('.label-subscription'); + $('.label-subscription').each((i, el) => { + const $el = $(el); + + if ($el.find('.dropdown-group-label').length) { + new gl.GroupLabelSubscription($el); + } else { + new gl.ProjectLabelSubscription($el); + } + }); break; case 'projects:network:show': // Ensure we don't create a particular shortcut handler here. This is diff --git a/app/assets/javascripts/init_legacy_filters.js b/app/assets/javascripts/init_legacy_filters.js index aa25f295bbc..1211c2c802c 100644 --- a/app/assets/javascripts/init_legacy_filters.js +++ b/app/assets/javascripts/init_legacy_filters.js @@ -1,10 +1,11 @@ /* eslint-disable no-new */ -/* global UsersSelect */ /* global LabelsSelect */ /* global MilestoneSelect */ /* global IssueStatusSelect */ /* global SubscriptionSelect */ +import UsersSelect from './users_select'; + export default () => { new UsersSelect(); new LabelsSelect(); diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 17030c3e4d3..d74cf5328ad 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -2,6 +2,7 @@ /* global Flash */ import Vue from 'vue'; +import initIssuableSidebar from '../init_issuable_sidebar'; import './merge_conflict_store'; import './merge_conflict_service'; import './mixins/line_conflict_utils'; @@ -19,6 +20,8 @@ $(() => { resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath }); + initIssuableSidebar(); + gl.MergeConflictsResolverApp = new Vue({ el: '#conflicts', data: mergeConflictsStore.state, |