diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-03-06 18:08:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-03-06 18:08:14 +0200 |
| commit | 674f8739c93378a43ba399ccbc01aecaed4878fa (patch) | |
| tree | 981d030793a5c5dd608007e2a4fac5f5e457e17a | |
| parent | 9d250a8e49972cbf668bc1b36abc42b439253c1d (diff) | |
| download | gitlab-ce-674f8739c93378a43ba399ccbc01aecaed4878fa.tar.gz | |
Remove plugins from project integrations page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/views/projects/settings/integrations/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/plugins/_index.html.haml | 14 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-plugins-project-integrations.yml | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml index 5303430ab59..2f1a548e119 100644 --- a/app/views/projects/settings/integrations/show.html.haml +++ b/app/views/projects/settings/integrations/show.html.haml @@ -3,4 +3,3 @@ - page_title 'Integrations' = render 'projects/hooks/index' = render 'projects/services/index' -= render 'shared/plugins/index' diff --git a/app/views/shared/plugins/_index.html.haml b/app/views/shared/plugins/_index.html.haml index 7a85884907a..fc643c3ecc2 100644 --- a/app/views/shared/plugins/_index.html.haml +++ b/app/views/shared/plugins/_index.html.haml @@ -6,14 +6,18 @@ Plugins %p #{link_to 'Plugins', help_page_path('administration/plugins')} are similar to - system hooks but can be are executed as files instead of URL. + system hooks but are executed as files instead of sending data to a URL. .col-lg-8.append-bottom-default - if plugins.any? - %ul.content-list - - plugins.each do |file| - %li - = File.basename(file) + .panel.panel-default + .panel-heading + Plugins (#{plugins.count}) + %ul.content-list + - plugins.each do |file| + %li + .monospace + = File.basename(file) - else %p.light-well.text-center No plugins found. diff --git a/changelogs/unreleased/dz-plugins-project-integrations.yml b/changelogs/unreleased/dz-plugins-project-integrations.yml new file mode 100644 index 00000000000..9dbe82f9af8 --- /dev/null +++ b/changelogs/unreleased/dz-plugins-project-integrations.yml @@ -0,0 +1,5 @@ +--- +title: Add plugins list to the system hooks page +merge_request: 17518 +author: +type: added |