From 6681ea9cd8d7001a352c95237d625057b6147f0b Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 18 Sep 2017 14:00:59 +0200 Subject: Simplify pipeline source policy pattern matching --- lib/gitlab/ci/build/policy/refs.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/gitlab/ci/build/policy/refs.rb b/lib/gitlab/ci/build/policy/refs.rb index 641c2e510be..76a57f041e3 100644 --- a/lib/gitlab/ci/build/policy/refs.rb +++ b/lib/gitlab/ci/build/policy/refs.rb @@ -27,7 +27,8 @@ module Gitlab def matches_pattern?(pattern, pipeline) return true if pipeline.tag? && pattern == 'tags' return true if pipeline.branch? && pattern == 'branches' - return true if source_to_pattern(pipeline.source) == pattern + return true if pipeline.source == pattern + return true if pipeline.source&.pluralize == pattern if pattern.first == "/" && pattern.last == "/" Regexp.new(pattern[1...-1]) =~ pipeline.ref @@ -35,14 +36,6 @@ module Gitlab pattern == pipeline.ref end end - - def source_to_pattern(source) - if %w[api external web].include?(source) - source - else - source&.pluralize - end - end end end end -- cgit v1.2.1