summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/ide.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-22 12:32:37 +0100
committerPhil Hughes <me@iamphill.com>2018-05-24 10:38:01 +0100
commit32f965b244f38b8f94aff0d0f7bb952de7593127 (patch)
tree2259d8212abb7dd48bf1a3af4be911a44b002ea2 /app/assets/javascripts/ide/components/ide.vue
parente97a87433b2f55b2f688771cbe47d627f49d4b44 (diff)
downloadgitlab-ce-32f965b244f38b8f94aff0d0f7bb952de7593127.tar.gz
Added right sidebar components
Diffstat (limited to 'app/assets/javascripts/ide/components/ide.vue')
-rw-r--r--app/assets/javascripts/ide/components/ide.vue6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index 1ec69adce09..d61ed36a757 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -6,6 +6,7 @@ import RepoTabs from './repo_tabs.vue';
import IdeStatusBar from './ide_status_bar.vue';
import RepoEditor from './repo_editor.vue';
import FindFile from './file_finder/index.vue';
+import RightSidebar from './right_sidebar/index.vue';
const originalStopCallback = Mousetrap.stopCallback;
@@ -16,6 +17,7 @@ export default {
IdeStatusBar,
RepoEditor,
FindFile,
+ RightSidebar,
},
computed: {
...mapState([
@@ -25,6 +27,7 @@ export default {
'currentMergeRequestId',
'fileFindVisible',
'emptyStateSvgPath',
+ 'currentProjectId',
]),
...mapGetters(['activeFile', 'hasChanges']),
},
@@ -122,6 +125,9 @@ export default {
</div>
</template>
</div>
+ <right-sidebar
+ v-if="currentProjectId"
+ />
</div>
<ide-status-bar
:file="activeFile"