diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-12 14:27:19 +0300 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-15 14:38:52 +0300 |
commit | cf29b815a576b37a25900d1df6ea653f923fca94 (patch) | |
tree | 0f04407ed927e2778434739b38b25b29439097ce /app | |
parent | 3c2fd63c37b0a34ebb6b17ef099d34fbecf7dc59 (diff) |
Merge branch '52608-sidebar' into 'master'
Hide job sidebar on mobile
Closes #52608
See merge request gitlab-org/gitlab-ce!22314
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/jobs/components/job_log_controllers.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/components/sidebar.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/job_details_bundle.js | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job_log_controllers.vue index 3e62ababea3..651f8fe7b8f 100644 --- a/app/assets/javascripts/jobs/components/job_log_controllers.vue +++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue @@ -66,7 +66,7 @@ }; </script> <template> - <div class="top-bar"> + <div class="top-bar affix js-top-bar"> <!-- truncate information --> <div class="js-truncated-info truncated-info d-none d-sm-block float-left"> <template v-if="isTraceSizeVisible"> diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index bc21f87af99..e757213a502 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -142,7 +142,7 @@ </script> <template> <aside - class="right-sidebar right-sidebar-expanded build-sidebar" + class="js-build-sidebar right-sidebar right-sidebar-expanded build-sidebar" data-offset-top="101" data-spy="affix" > diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js index 22eef770687..15cd79b1c50 100644 --- a/app/assets/javascripts/jobs/job_details_bundle.js +++ b/app/assets/javascripts/jobs/job_details_bundle.js @@ -9,8 +9,7 @@ import createStore from './store'; export default () => { const { dataset } = document.getElementById('js-job-details-vue'); - // eslint-disable-next-line no-new - new Job(); + const store = createStore(); store.dispatch('setJobEndpoint', dataset.endpoint); @@ -71,4 +70,7 @@ export default () => { }); }, }); + + // eslint-disable-next-line no-new + new Job(); }; |