summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-03-24 10:47:43 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-24 23:14:30 +0800
commit305f25fefc7502cb54e7dfac3aac25bb5e0c4043 (patch)
tree44f59b003a5a241ce2844292e1f68467085fc6ad
parenta0b445635a994aa8c9f3967b283cf79bb4f275b3 (diff)
downloadgitlab-ce-305f25fefc7502cb54e7dfac3aac25bb5e0c4043.tar.gz
Merge branch '29964-sidebar-js' into 'master'
Add sidebar class to build & wiki pages Closes #29964 See merge request !10196
-rw-r--r--app/views/projects/builds/_sidebar.html.haml3
-rw-r--r--app/views/projects/wikis/_sidebar.html.haml3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 78720d88e4e..4192013eab5 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -137,3 +137,6 @@
= build.id
- if build.retried?
%i.fa.fa-refresh.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
+
+:javascript
+ new Sidebar();
diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml
index 8c582f747b3..cfacb9e7b66 100644
--- a/app/views/projects/wikis/_sidebar.html.haml
+++ b/app/views/projects/wikis/_sidebar.html.haml
@@ -19,3 +19,6 @@
More Pages
= render 'projects/wikis/new'
+
+:javascript
+ new Sidebar();