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
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 12:08:16 +0300
commit6044caed20964a70c1ac6c5a3365d567ed96dfde (patch)
tree3fe8f14b4acbd542265544843efeb6f59b5d3efe /app/views/admin
parent92077e0f8d70c70a908395808b16f98ecd3a5fcd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/metrics_and_profiling.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/metrics_and_profiling.html.haml b/app/views/admin/application_settings/metrics_and_profiling.html.haml
index 0b747082de0..6a703d0b70c 100644
--- a/app/views/admin/application_settings/metrics_and_profiling.html.haml
+++ b/app/views/admin/application_settings/metrics_and_profiling.html.haml
@@ -60,4 +60,6 @@
.settings-content
= render 'usage'
+= render_if_exists 'admin/application_settings/seat_link_setting', expanded: expanded_by_default?
+
= render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded_by_default?