Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
465e5de5
Commit
465e5de5
authored
Jun 07, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix condition
parent
431d7972
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+5
-3
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+2
-1
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
465e5de5
...
@@ -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
)
un
matches_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
)
...
...
lib/gitlab/gitaly_client.rb
View file @
465e5de5
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment