Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-08-15 19:47:34 +0300
committerRobert Speicher <robert@gitlab.com>2018-08-15 19:47:34 +0300
commit085ed2862ce5c53362505bfc759ac8b1b881766d (patch)
treec2427414cb24ee4c0cca9bfe5d99d9df06b1e93e /app/views
parent39e8f0f2db57ed483db394bc38f67692d553d152 (diff)
parentd7be0dc818702b19d44afec575a3423c0d0fed25 (diff)
Merge branch 'backport-5986-license-templates' into 'master'
Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/application_settings/show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index 258d50ad676..6133a7646f4 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -325,6 +325,8 @@
.settings-content
= render partial: 'repository_mirrors_form'
+= render_if_exists 'admin/application_settings/templates', expanded: expanded
+
%section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }
.settings-header
%h4