diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-08-15 09:59:48 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-08-15 09:59:48 -0500 |
| commit | 9903cf26e393789ebf4f048a5c9bddd5877bbced (patch) | |
| tree | d9ae204638d57eaf23dc23adf903a6b4814c8b08 | |
| parent | 18a4be344da0887d4de1b6b222f68c640b15546c (diff) | |
| parent | 1e8c976d54b4a11ccaf0508cd499365bb81a4168 (diff) | |
| download | gitlab-ce-9903cf26e393789ebf4f048a5c9bddd5877bbced.tar.gz | |
Merge branch 'repo-fixes' of gitlab.com:gitlab-org/gitlab-ce into repo-fixes
Conflicts:
app/assets/javascripts/repo/components/repo.vue
| -rw-r--r-- | app/assets/javascripts/repo/components/repo.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/popup_dialog.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue index b42e3c4326e..3d5e01c8ec0 100644 --- a/app/assets/javascripts/repo/components/repo.vue +++ b/app/assets/javascripts/repo/components/repo.vue @@ -44,7 +44,9 @@ export default { <template> <div class="repository-view tree-content-holder"> - <repo-sidebar/><div v-if="isMini" class="panel-right" :class="{'edit-mode': editMode}"> + <repo-sidebar/><div v-if="isMini" + class="panel-right" + :class="{'edit-mode': editMode}"> <repo-tabs/> <component :is="currentBlobView" diff --git a/app/assets/javascripts/vue_shared/components/popup_dialog.vue b/app/assets/javascripts/vue_shared/components/popup_dialog.vue index 9d8f7e8c1e8..368712c2a42 100644 --- a/app/assets/javascripts/vue_shared/components/popup_dialog.vue +++ b/app/assets/javascripts/vue_shared/components/popup_dialog.vue @@ -46,7 +46,7 @@ const PopupDialog = { export default PopupDialog; </script> <template> -<div class="modal popup-dialog" tabindex="-1" role="dialog"> +<div class="modal popup-dialog" tabindex="-1" v-show="open" role="dialog"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> |