summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings/show.html.haml
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-08-03 17:36:53 +0200
committerLukas Eipert <leipert@gitlab.com>2018-08-03 19:27:07 +0200
commit273515b8a15cc9f920d6bf868f6a546ad832214e (patch)
treed4584191d3700744bfe2df2593ce9ee477582cd4 /app/views/admin/application_settings/show.html.haml
parent8a9421429d15a805ef07b8200bcba551fe7314ff (diff)
downloadgitlab-ce-273515b8a15cc9f920d6bf868f6a546ad832214e.tar.gz
backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6740
Diffstat (limited to 'app/views/admin/application_settings/show.html.haml')
-rw-r--r--app/views/admin/application_settings/show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index 5cb8001a364..1c8801566d4 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -336,5 +336,6 @@
.settings-content
= render 'third_party_offers', application_setting: @application_setting
-= render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded
+= render_if_exists 'admin/application_settings/custom_templates_form', expanded: expanded
+= render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded