Merge branch 'dz-deprecate-plugins-dir' into 'master'

Deprecate /plugins directory

See merge request gitlab-org/gitlab!29678

app/views/shared/file_hooks/_index.html.haml

@@ -19,6 +19,10 @@
             %li
               .monospace
                 = File.basename(file)
+              - if File.dirname(file).ends_with?('plugins')
+                .text-warning
+                  = _('Plugins directory is deprecated and will be removed in 14.0. Please move this file into /file_hooks directory.')
+
     - else
       .card.bg-light.text-center
         .nothing-here-block= _('No file hooks found.')

changelogs/unreleased/dz-deprecate-plugins-dir.yml

+---
+title: Deprecate /plugins directory
+merge_request: 29678
+author:
+type: deprecated

lib/tasks/file_hooks.rake

@@ -4,6 +4,11 @@ namespace :file_hooks do
     puts 'Validating file hooks from /file_hooks and /plugins directories'
 
     Gitlab::FileHook.files.each do |file|
+      if File.dirname(file).ends_with?('plugins')
+        puts 'DEPRECATED: /plugins directory is deprecated and will be removed in 14.0. ' \
+          'Please move your files into /file_hooks directory.'
+      end
+
       success, message = Gitlab::FileHook.execute(file, Gitlab::DataBuilder::Push::SAMPLE_DATA)
 
       if success

locale/gitlab.pot

@@ -15190,6 +15190,9 @@ msgstr ""
 msgid "Please wait while we import the repository for you. Refresh at will."
 msgstr ""
 
+msgid "Plugins directory is deprecated and will be removed in 14.0. Please move this file into /file_hooks directory."
+msgstr ""
+
 msgid "Pod does not exist"
 msgstr ""
 

spec/features/admin/admin_hooks_spec.rb

@@ -36,6 +36,24 @@ describe 'Admin::Hooks' do
       expect(page).to have_content('foo.rb')
       expect(page).to have_content('bar.clj')
     end
+
+    context 'deprecation warning' do
+      it 'shows warning for plugins directory' do
+        allow(Gitlab::FileHook).to receive(:files).and_return(['plugins/foo.rb'])
+
+        visit admin_hooks_path
+
+        expect(page).to have_content('Plugins directory is deprecated and will be removed in 14.0')
+      end
+
+      it 'does not show warning for file_hooks directory' do
+        allow(Gitlab::FileHook).to receive(:files).and_return(['file_hooks/foo.rb'])
+
+        visit admin_hooks_path
+
+        expect(page).not_to have_content('Plugins directory is deprecated and will be removed in 14.0')
+      end
+    end
   end
 
   describe 'New Hook' do