diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
commit | 120f4aaedc8fe830a3f572491d240d8ee6addefb (patch) | |
tree | a2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /app/views/admin | |
parent | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/application_settings/general.html.haml | 9 | ||||
-rw-r--r-- | app/views/admin/application_settings/integrations.html.haml | 38 | ||||
-rw-r--r-- | app/views/admin/integrations/edit.html.haml | 2 |
3 files changed, 38 insertions, 11 deletions
diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml index 94048060767..1a029996aaf 100644 --- a/app/views/admin/application_settings/general.html.haml +++ b/app/views/admin/application_settings/general.html.haml @@ -103,3 +103,12 @@ = s_('IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox client side evaluation.') = f.submit _('Save changes'), class: "btn btn-success" + +- if Feature.enabled?(:instance_level_integrations) + = render_if_exists 'admin/application_settings/elasticsearch_form' + = render 'admin/application_settings/plantuml' + = render 'admin/application_settings/sourcegraph' + = render_if_exists 'admin/application_settings/slack' + = render 'admin/application_settings/third_party_offers' + = render 'admin/application_settings/snowplow' + = render 'admin/application_settings/eks' diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index c6318c9bb2f..14df0599583 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -1,12 +1,30 @@ -- breadcrumb_title _("Integrations") -- page_title _("Integrations") -- @content_class = "limit-container-width" unless fluid_layout +- breadcrumb_title _('Integrations') +- page_title _('Integrations') +- @content_class = 'limit-container-width' unless fluid_layout -= render_if_exists 'admin/application_settings/elasticsearch_form' -= render 'admin/application_settings/plantuml' -= render 'admin/application_settings/sourcegraph' -= render_if_exists 'admin/application_settings/slack' -= render 'admin/application_settings/third_party_offers' -= render 'admin/application_settings/snowplow' -= render 'admin/application_settings/eks' +- if Feature.enabled?(:instance_level_integrations) + - if show_admin_integrations_moved? + .gl-alert.gl-alert-info.js-admin-integrations-moved.mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::ADMIN_INTEGRATIONS_MOVED, dismiss_endpoint: user_callouts_path } } + = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } + = sprite_icon('close', size: 16, css_class: 'gl-icon') + .gl-alert-body + %h4.gl-alert-title= s_('AdminSettings|Some settings have moved') + = s_('AdminSettings|Elasticsearch, PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings > General.') + .gl-alert-actions + = link_to s_('AdminSettings|Go to General Settings'), admin_application_settings_path, class: 'btn gl-alert-action btn-info new-gl-button' + %h4= s_('AdminSettings|Apply integration settings to all Projects') + %p + = s_('AdminSettings|Integrations configured here will automatically apply to all projects on this instance.') + = link_to _('Learn more'), '#' + = render 'projects/services/integrations' + +- else + = render_if_exists 'admin/application_settings/elasticsearch_form' + = render 'admin/application_settings/plantuml' + = render 'admin/application_settings/sourcegraph' + = render_if_exists 'admin/application_settings/slack' + = render 'admin/application_settings/third_party_offers' + = render 'admin/application_settings/snowplow' + = render 'admin/application_settings/eks' diff --git a/app/views/admin/integrations/edit.html.haml b/app/views/admin/integrations/edit.html.haml index dea0f524f03..b19d00d7a16 100644 --- a/app/views/admin/integrations/edit.html.haml +++ b/app/views/admin/integrations/edit.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Integrations'), admin_application_settings_integration_path +- add_to_breadcrumbs _('Integrations'), integrations_admin_application_settings_path - breadcrumb_title @service.title - page_title @service.title, _('Integrations') |