Add latest changes from gitlab-org/gitlab@master

spec/models/project_spec.rb

@@ -4745,7 +4745,7 @@ describe Project do
     end
     it 'returns true when a plugin exists' do
-      expect(Gitlab::Plugin).to receive(:any?).twice.and_return(true)
+      expect(Gitlab::FileHook).to receive(:any?).twice.and_return(true)
       expect(project.has_active_hooks?(:merge_request_events)).to be_truthy
       expect(project.has_active_hooks?).to be_truthy

spec/workers/plugin_worker_spec.rb → spec/workers/file_hook_worker_spec.rb

@@ -2,25 +2,25 @@
 require 'spec_helper'
-describe PluginWorker do
+describe FileHookWorker do
   include RepoHelpers
-  let(:filename) { 'my_plugin.rb' }
+  let(:filename) { 'my_file_hook.rb' }
   let(:data) { { 'event_name' => 'project_create' } }
   subject { described_class.new }
   describe '#perform' do
-    it 'executes Gitlab::Plugin with expected values' do
-      allow(Gitlab::Plugin).to receive(:execute).with(filename, data).and_return([true, ''])
+    it 'executes Gitlab::FileHook with expected values' do
+      allow(Gitlab::FileHook).to receive(:execute).with(filename, data).and_return([true, ''])
       expect(subject.perform(filename, data)).to be_truthy
     end
-    it 'logs message in case of plugin execution failure' do
-      allow(Gitlab::Plugin).to receive(:execute).with(filename, data).and_return([false, 'permission denied'])
-      expect(Gitlab::PluginLogger).to receive(:error)
+    it 'logs message in case of file_hook execution failure' do
+      allow(Gitlab::FileHook).to receive(:execute).with(filename, data).and_return([false, 'permission denied'])
+      expect(Gitlab::FileHookLogger).to receive(:error)
       expect(subject.perform(filename, data)).to be_truthy
     end
   end