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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
451b684d
Commit
451b684d
authored
Jun 07, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use source instead of trigger_requests in stage_seeds
parent
835f97a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-3
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+1
-2
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
451b684d
...
@@ -51,11 +51,9 @@ module Ci
...
@@ -51,11 +51,9 @@ module Ci
end
end
def
stage_seeds
(
pipeline
)
def
stage_seeds
(
pipeline
)
trigger_request
=
pipeline
.
trigger_requests
.
first
seeds
=
@stages
.
uniq
.
map
do
|
stage
|
seeds
=
@stages
.
uniq
.
map
do
|
stage
|
builds
=
builds_for_stage_and_ref
(
builds
=
builds_for_stage_and_ref
(
stage
,
pipeline
.
ref
,
pipeline
.
tag?
,
trigger_request
)
stage
,
pipeline
.
ref
,
pipeline
.
tag?
,
pipeline
.
source
)
Gitlab
::
Ci
::
Stage
::
Seed
.
new
(
pipeline
,
stage
,
builds
)
if
builds
.
any?
Gitlab
::
Ci
::
Stage
::
Seed
.
new
(
pipeline
,
stage
,
builds
)
if
builds
.
any?
end
end
...
...
lib/gitlab/gitaly_client.rb
View file @
451b684d
...
@@ -49,8 +49,7 @@ module Gitlab
...
@@ -49,8 +49,7 @@ 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