diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-08 12:38:19 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-08 12:38:19 +0300 |
commit | b2ef7f6cd9b98681aeb2274e29f0b3aaac423fc9 (patch) | |
tree | 22b2724a475aaca4c3ef6d0a0e6bbc28c7f1fddf /app/assets/javascripts | |
parent | 2c05c8574f9bdef89008381754aee9566b58ad86 (diff) | |
parent | 91254c11b102ceeb79e787a693616ecf8ecb6ba9 (diff) |
Merge branch 'ide-pipeline-panel-resizable' into 'master'
Allow IDE pipeline panel to be resizable
Closes #47538
See merge request gitlab-org/gitlab-ce!19558
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/ide/components/panes/right.vue | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/panes/right.vue b/app/assets/javascripts/ide/components/panes/right.vue index aafd6a15a78..dd7fc8f1e01 100644 --- a/app/assets/javascripts/ide/components/panes/right.vue +++ b/app/assets/javascripts/ide/components/panes/right.vue @@ -5,6 +5,7 @@ import Icon from '../../../vue_shared/components/icon.vue'; import { rightSidebarViews } from '../../constants'; import PipelinesList from '../pipelines/list.vue'; import JobsDetail from '../jobs/detail.vue'; +import ResizablePanel from '../resizable_panel.vue'; export default { directives: { @@ -14,6 +15,7 @@ export default { Icon, PipelinesList, JobsDetail, + ResizablePanel, }, computed: { ...mapState(['rightPane']), @@ -40,12 +42,16 @@ export default { <div class="multi-file-commit-panel ide-right-sidebar" > - <div - class="multi-file-commit-panel-inner" + <resizable-panel v-if="rightPane" + class="multi-file-commit-panel-inner" + :collapsible="false" + :initial-width="350" + :min-size="350" + side="right" > <component :is="rightPane" /> - </div> + </resizable-panel> <nav class="ide-activity-bar"> <ul class="list-unstyled"> <li> |