Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-06-07 16:24:11 +0300
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-06-07 18:34:59 +0300
commit465e5de5107da7e280902de581ee29c6f0cd1abc (patch)
treeb754e8baf63777033061e5fe164d22ee27d1022b /lib
parent431d7972b6d0f492bd82004b80d426f2e2cff6a5 (diff)
Fix condition
Diffstat (limited to 'lib')
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb8
-rw-r--r--lib/gitlab/gitaly_client.rb3
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 738ff474596..bd3ce40ca4b 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -208,12 +208,14 @@ module Ci
def matching?(patterns, ref, tag, source)
patterns.any? do |pattern|
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
- def unmatches_path?(path)
- path && path != self.path
+ def matches_path?(path)
+ return true unless path
+
+ path == self.path
end
def matches_pattern?(pattern, ref, tag, source)
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 2343446bf22..598f642415a 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -49,7 +49,8 @@ module Gitlab
end
def self.enabled?
- Gitlab.config.gitaly.enabled
+ # Gitlab.config.gitaly.enabled
+ false
end
def self.feature_enabled?(feature, status: MigrationStatus::OPT_IN)