Commit 465e5de5 authored by Shinya Maeda's avatar Shinya Maeda

Fix condition

parent 431d7972
...@@ -208,12 +208,14 @@ module Ci ...@@ -208,12 +208,14 @@ module Ci
def matching?(patterns, ref, tag, source) def matching?(patterns, ref, tag, source)
patterns.any? do |pattern| patterns.any? do |pattern|
pattern, path = pattern.split('@', 2) pattern, path = pattern.split('@', 2)
unmatches_path?(path) && matches_pattern?(pattern, ref, tag, source) matches_path?(path) && matches_pattern?(pattern, ref, tag, source)
end end
end end
def unmatches_path?(path) def matches_path?(path)
path && path != self.path return true unless path
path == self.path
end end
def matches_pattern?(pattern, ref, tag, source) def matches_pattern?(pattern, ref, tag, source)
......
...@@ -49,7 +49,8 @@ module Gitlab ...@@ -49,7 +49,8 @@ module Gitlab
end end
def self.enabled? def self.enabled?
Gitlab.config.gitaly.enabled # Gitlab.config.gitaly.enabled
false
end end
def self.feature_enabled?(feature, status: MigrationStatus::OPT_IN) def self.feature_enabled?(feature, status: MigrationStatus::OPT_IN)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment