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 /app/assets/javascripts/merge_conflicts | |
parent | 887227e0371858d5d048f61bfe0700e4b7ebab58 (diff) | |
download | gitlab-ce-425dbdd222244bc00cab8c2dbd6bb94233d11a15.tar.gz |
fixed label subscription & merge conflicts
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 3 |
1 files changed, 3 insertions, 0 deletions
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, |