BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
40415689
Commit
40415689
authored
Dec 16, 2016
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'change_development_build_fixtures' into 'master'
Made Ci::Builds to have same ref as Ci::Pipeline in dev fixtures See merge request !8110
parents
c29a184f
0a5427d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
change_development_build_fixtures.yml
changelogs/unreleased/change_development_build_fixtures.yml
+4
-0
14_pipelines.rb
db/fixtures/development/14_pipelines.rb
+1
-1
No files found.
changelogs/unreleased/change_development_build_fixtures.yml
0 → 100644
View file @
40415689
---
title
:
Ci::Builds have same ref as Ci::Pipeline in dev fixtures
merge_request
:
author
:
twonegatives
db/fixtures/development/14_pipelines.rb
View file @
40415689
...
@@ -115,7 +115,7 @@ class Gitlab::Seeder::Pipelines
...
@@ -115,7 +115,7 @@ class Gitlab::Seeder::Pipelines
def
job_attributes
(
pipeline
,
opts
)
def
job_attributes
(
pipeline
,
opts
)
{
name:
'test build'
,
stage:
'test'
,
stage_idx:
stage_index
(
opts
[
:stage
]),
{
name:
'test build'
,
stage:
'test'
,
stage_idx:
stage_index
(
opts
[
:stage
]),
ref:
'master'
,
tag:
false
,
user:
build_user
,
project:
@project
,
pipeline:
pipeline
,
ref:
pipeline
.
ref
,
tag:
false
,
user:
build_user
,
project:
@project
,
pipeline:
pipeline
,
created_at:
Time
.
now
,
updated_at:
Time
.
now
created_at:
Time
.
now
,
updated_at:
Time
.
now
}.
merge
(
opts
)
}.
merge
(
opts
)
end
end
...
...
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