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
c048d5d2
Commit
c048d5d2
authored
Nov 22, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix entry lookup in CI config inheritance rules
parent
4c34b4e5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lib/gitlab/ci/config/entry/job.rb
lib/gitlab/ci/config/entry/job.rb
+1
-1
spec/lib/gitlab/ci/config/entry/global_spec.rb
spec/lib/gitlab/ci/config/entry/global_spec.rb
+3
-1
No files found.
lib/gitlab/ci/config/entry/job.rb
View file @
c048d5d2
...
@@ -108,7 +108,7 @@ module Gitlab
...
@@ -108,7 +108,7 @@ module Gitlab
self
.
class
.
nodes
.
each_key
do
|
key
|
self
.
class
.
nodes
.
each_key
do
|
key
|
global_entry
=
deps
[
key
]
global_entry
=
deps
[
key
]
job_entry
=
@entries
[
key
]
job_entry
=
self
[
key
]
if
global_entry
.
specified?
&&
!
job_entry
.
specified?
if
global_entry
.
specified?
&&
!
job_entry
.
specified?
@entries
[
key
]
=
global_entry
@entries
[
key
]
=
global_entry
...
...
spec/lib/gitlab/ci/config/entry/global_spec.rb
View file @
c048d5d2
...
@@ -254,7 +254,9 @@ describe Gitlab::Ci::Config::Entry::Global do
...
@@ -254,7 +254,9 @@ describe Gitlab::Ci::Config::Entry::Global do
end
end
context
'when job does not have commands'
do
context
'when job does not have commands'
do
let
(
:hash
)
{
{
rspec:
{
stage:
'test'
}
}
}
let
(
:hash
)
do
{
before_script:
[
'echo 123'
],
rspec:
{
stage:
'test'
}
}
end
describe
'#errors'
do
describe
'#errors'
do
it
'reports errors about missing script'
do
it
'reports errors about missing script'
do
...
...
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