summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-31 21:02:57 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-31 21:02:57 +0000
commit577bb4ebe83a2ec7811b240b8023b7ff6ef3bb85 (patch)
tree8c1141c31a89ca2731e93ccfc15029632b1e6f45 /app/views
parent43c575acf3e9b3b7d749a1e99bc4726e56823c4c (diff)
parent87346bfe6de362b832e27c75f3e9b1def2ef1f11 (diff)
downloadgitlab-ce-577bb4ebe83a2ec7811b240b8023b7ff6ef3bb85.tar.gz
Merge branch '19164-mobile-settings' into 'master'
19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/nav/_admin.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index ac04f57e217..19a947af4ca 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,5 +1,5 @@
+= render 'layouts/nav/admin_settings'
.scrolling-tabs-container{ class: nav_control_class }
- = render 'layouts/nav/admin_settings'
.fade-left
= icon('angle-left')
.fade-right