diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
| commit | 80e9fdc9682cfbcfb9202a2733605a6a6bd23f05 (patch) | |
| tree | 168375ea13d1a1f01d4cbcf6f0513fc9883e9477 /app/views | |
| parent | 5372e109c0660e4670aa987568a51082beca1b3c (diff) | |
| download | gitlab-ce-80e9fdc9682cfbcfb9202a2733605a6a6bd23f05.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/integrations.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/settings/integrations/index.html.haml | 9 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/integrations/_integrations.html.haml (renamed from app/views/projects/services/_integrations.html.haml) | 4 |
4 files changed, 17 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 14df0599583..2b01160a230 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -18,7 +18,7 @@ %p = s_('AdminSettings|Integrations configured here will automatically apply to all projects on this instance.') = link_to _('Learn more'), '#' - = render 'projects/services/integrations' + = render 'shared/integrations/integrations', integrations: @integrations - else = render_if_exists 'admin/application_settings/elasticsearch_form' diff --git a/app/views/groups/settings/integrations/index.html.haml b/app/views/groups/settings/integrations/index.html.haml new file mode 100644 index 00000000000..78825cc72b0 --- /dev/null +++ b/app/views/groups/settings/integrations/index.html.haml @@ -0,0 +1,9 @@ +- breadcrumb_title _('Integrations') +- page_title _('Integrations') +- @content_class = 'limit-container-width' unless fluid_layout + +%h4= s_('GroupSettings|Apply integration settings to all Projects') +%p + = s_('GroupSettings|Integrations configured here will automatically apply to all projects in this group.') + = link_to _('Learn more'), '#' += render 'shared/integrations/integrations', integrations: @integrations diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index b3acf3320d3..89bcccb6185 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -159,6 +159,11 @@ = link_to group_settings_ci_cd_path(@group), title: _('CI / CD') do %span = _('CI / CD') + - if Feature.enabled?(:group_level_integrations, @group) + = nav_link(controller: :integrations) do + = link_to group_settings_integrations_path(@group), title: _('Integrations') do + %span + = _('Integrations') = render_if_exists "groups/ee/settings_nav" diff --git a/app/views/projects/services/_integrations.html.haml b/app/views/shared/integrations/_integrations.html.haml index 24aeb598d7b..b2359aca016 100644 --- a/app/views/projects/services/_integrations.html.haml +++ b/app/views/shared/integrations/_integrations.html.haml @@ -12,12 +12,12 @@ %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 4 }= _('Last updated') %tbody{ role: 'rowgroup' } - - @integrations.each do |integration| + - integrations.each do |integration| %tr{ role: 'row' } %td{ role: 'cell', 'aria-colindex': 1 } = boolean_to_icon integration.activated? %td{ role: 'cell', 'aria-colindex': 2 } - = link_to edit_integration_path(integration) do + = link_to scoped_edit_integration_path(integration) do %strong= integration.title %td.d-none.d-sm-block{ role: 'cell', 'aria-colindex': 3 } = integration.description |