Refactor: move active hook filter to TriggerableHooks

3 files changed, 8 insertions, 1 deletions

diff --git a/app/models/concerns/triggerable_hooks.rb b/app/models/concerns/triggerable_hooks.rb
index f55ab2fcaf3..9f2e8b420bc 100644
--- a/app/models/concerns/triggerable_hooks.rb
+++ b/app/models/concerns/triggerable_hooks.rb
@@ -28,6 +28,12 @@ module TriggerableHooks
       public_send(trigger) # rubocop:disable GitlabSecurity/PublicSend
     end
 
+    def select_active(hooks_scope, data)
+      select do |hook|
+        ActiveHookFilter.new(hook).matches?(hooks_scope, data)
+      end
+    end
+
     private
 
     def triggerable_hooks(hooks)
diff --git a/app/models/project.rb b/app/models/project.rb
index 72a53e1a50d..728bbffd671 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1163,7 +1163,7 @@ class Project < ActiveRecord::Base
 
   def execute_hooks(data, hooks_scope = :push_hooks)
     run_after_commit_or_now do
-      hooks.hooks_for(hooks_scope).select {|hook| ActiveHookFilter.new(hook).matches?(hooks_scope, data)}.each do |hook|
+      hooks.hooks_for(hooks_scope).select_active(hooks_scope, data).each do |hook|
         hook.async_execute(data, hooks_scope.to_s)
       end
       SystemHooksService.new.execute_hooks(data, hooks_scope)
diff --git a/app/validators/branch_filter_validator.rb b/app/validators/branch_filter_validator.rb
index 0965be3d101..ef482aaaa63 100644
--- a/app/validators/branch_filter_validator.rb
+++ b/app/validators/branch_filter_validator.rb
@@ -16,6 +16,7 @@ class BranchFilterValidator < ActiveModel::EachValidator
 
     if value.present?
       value_without_wildcards = value.tr('*', 'x')
+
       unless Gitlab::GitRefValidator.validate(value_without_wildcards)
         record.errors[attribute] << "is not a valid branch name"
       end