kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix condition

Browse source
This commit is contained in:
Shinya Maeda 2017-06-07 22:24:11 +09:00
parent 431d7972b6
commit 465e5de510
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ci/gitlab_ci_yaml_processor.rb
View file

@ -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)

3
lib/gitlab/gitaly_client.rb
View file

@ -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)