diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 15:10:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 15:10:23 +0300 |
| commit | 76ef00aac974a463243dcda6f692b17ff5d439bc (patch) | |
| tree | 21645caa87c2cdd5cc15195c7a402e52c58f73c4 /app/views/admin/application_settings/integrations.html.haml | |
| parent | 686c2375e1c9c559e3e7e04a8fbfbdafd9671932 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings/integrations.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/integrations.html.haml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 93bc054754e..92b545cad0a 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -2,17 +2,6 @@ - page_title _('Integrations') - @content_class = 'limit-container-width' unless fluid_layout -- 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', 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', css_class: 'gl-icon') - .gl-alert-body - %h4.gl-alert-title= s_('AdminSettings|Some settings have moved') - = html_escape_once(s_('AdminSettings|PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings > General.')).html_safe - .gl-alert-actions - = link_to s_('AdminSettings|Go to General Settings'), general_admin_application_settings_path, class: 'btn gl-alert-action btn-info gl-button' - %h3= s_('Integrations|Project integration management') - integrations_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: integrations_help_page_path } |