diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-08-14 22:33:14 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-08-15 07:38:18 +0100 |
| commit | d7be0dc818702b19d44afec575a3423c0d0fed25 (patch) | |
| tree | 6bb0616755991778efbdd7aff7131b8b27db0906 /app | |
| parent | 3422cca4b731cf9786822a5971dc1ada308c1b16 (diff) | |
| download | gitlab-ce-d7be0dc818702b19d44afec575a3423c0d0fed25.tar.gz | |
Changes /admin/application_settings to support template repository selection in EE
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pages/admin/application_settings/index.js | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/admin/application_settings/index.js b/app/assets/javascripts/pages/admin/application_settings/index.js index 48d75f5443b..47bd70537f1 100644 --- a/app/assets/javascripts/pages/admin/application_settings/index.js +++ b/app/assets/javascripts/pages/admin/application_settings/index.js @@ -1,6 +1,8 @@ import initSettingsPanels from '~/settings_panels'; +import projectSelect from '~/project_select'; document.addEventListener('DOMContentLoaded', () => { // Initialize expandable settings panels initSettingsPanels(); + projectSelect(); }); 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 |