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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
dbf235f5
Commit
dbf235f5
authored
Jun 07, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests failures
parent
4e38d88d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
app/services/ci/create_builds_service.rb
app/services/ci/create_builds_service.rb
+1
-1
spec/features/merge_requests/created_from_fork_spec.rb
spec/features/merge_requests/created_from_fork_spec.rb
+2
-2
spec/features/projects/commit/builds_spec.rb
spec/features/projects/commit/builds_spec.rb
+2
-2
spec/lib/gitlab/badge/build_spec.rb
spec/lib/gitlab/badge/build_spec.rb
+2
-2
spec/models/build_spec.rb
spec/models/build_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/services/ci/create_builds_service.rb
View file @
dbf235f5
...
@@ -5,7 +5,7 @@ module Ci
...
@@ -5,7 +5,7 @@ module Ci
end
end
def
execute
(
stage
,
user
,
status
,
trigger_request
=
nil
)
def
execute
(
stage
,
user
,
status
,
trigger_request
=
nil
)
builds_attrs
=
config_processor
.
builds_for_stage_and_ref
(
stage
,
@
commit
.
ref
,
@commit
.
tag
,
trigger_request
)
builds_attrs
=
config_processor
.
builds_for_stage_and_ref
(
stage
,
@
pipeline
.
ref
,
@pipeline
.
tag
,
trigger_request
)
# check when to create next build
# check when to create next build
builds_attrs
=
builds_attrs
.
select
do
|
build_attrs
|
builds_attrs
=
builds_attrs
.
select
do
|
build_attrs
|
...
...
spec/features/merge_requests/created_from_fork_spec.rb
View file @
dbf235f5
spec/features/projects/commit/builds_spec.rb
View file @
dbf235f5
spec/lib/gitlab/badge/build_spec.rb
View file @
dbf235f5
spec/models/build_spec.rb
View file @
dbf235f5
...
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
...
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
context
'and trigger variables'
do
context
'and trigger variables'
do
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
)
}
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
)
}
let
(
:trigger_request
)
{
create
(
:ci_trigger_request_with_variables
,
pipeline
:
pipeline
,
trigger:
trigger
)
}
let
(
:trigger_request
)
{
create
(
:ci_trigger_request_with_variables
,
commit
:
pipeline
,
trigger:
trigger
)
}
let
(
:trigger_variables
)
do
let
(
:trigger_variables
)
do
[
[
{
key: :TRIGGER_KEY
,
value:
'TRIGGER_VALUE'
,
public:
false
}
{
key: :TRIGGER_KEY
,
value:
'TRIGGER_VALUE'
,
public:
false
}
...
...
spec/models/project_spec.rb
View file @
dbf235f5
...
@@ -401,7 +401,7 @@ describe Project, models: true do
...
@@ -401,7 +401,7 @@ describe Project, models: true do
describe
:pipeline
do
describe
:pipeline
do
let
(
:project
)
{
create
:project
}
let
(
:project
)
{
create
:project
}
let
(
:pipeline
)
{
create
:pipeline
,
project:
project
,
ref:
'master'
}
let
(
:pipeline
)
{
create
:
ci_
pipeline
,
project:
project
,
ref:
'master'
}
subject
{
project
.
pipeline
(
pipeline
.
sha
,
'master'
)
}
subject
{
project
.
pipeline
(
pipeline
.
sha
,
'master'
)
}
...
...
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