Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 23 deletions

diff --git a/app/views/shared/file_hooks/_index.html.haml b/app/views/shared/file_hooks/_index.html.haml
new file mode 100644
index 00000000000..74eb6c94116
--- /dev/null
+++ b/app/views/shared/file_hooks/_index.html.haml
@@ -0,0 +1,24 @@
+- file_hooks = Gitlab::FileHook.files
+
+.row.prepend-top-default
+  .col-lg-4
+    %h4.prepend-top-0
+      = _('File Hooks')
+    %p
+      = _('File hooks are similar to system hooks but are executed as files instead of sending data to a URL.')
+      = link_to _('For more information, see the File Hooks documentation.'), help_page_path('administration/file_hooks')
+
+
+  .col-lg-8.append-bottom-default
+    - if file_hooks.any?
+      .card
+        .card-header
+          = _('File Hooks (%{count})') % { count: file_hooks.count }
+        %ul.content-list
+          - file_hooks.each do |file|
+            %li
+              .monospace
+                = File.basename(file)
+    - else
+      .card.bg-light.text-center
+        .nothing-here-block= _('No file hooks found.')
diff --git a/app/views/shared/plugins/_index.html.haml b/app/views/shared/plugins/_index.html.haml
deleted file mode 100644
index 9d230d12be2..00000000000
--- a/app/views/shared/plugins/_index.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-- plugins = Gitlab::Plugin.files
-
-.row.prepend-top-default
-  .col-lg-4
-    %h4.prepend-top-0
-      Plugins
-    %p
-      #{link_to 'Plugins', help_page_path('administration/plugins')} are similar to
-      system hooks but are executed as files instead of sending data to a URL.
-
-  .col-lg-8.append-bottom-default
-    - if plugins.any?
-      .card
-        .card-header
-          Plugins (#{plugins.count})
-        %ul.content-list
-          - plugins.each do |file|
-            %li
-              .monospace
-                = File.basename(file)
-    - else
-      .card.bg-light.text-center
-        .nothing-here-block No plugins found.