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
e7e3d6d2
Commit
e7e3d6d2
authored
Oct 29, 2019
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
2ab77fa2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ee/lib/ee/gitlab/ci/config/entry/bridge.rb
ee/lib/ee/gitlab/ci/config/entry/bridge.rb
+4
-4
lib/gitlab/ci/config/entry/job.rb
lib/gitlab/ci/config/entry/job.rb
+2
-1
No files found.
ee/lib/ee/gitlab/ci/config/entry/bridge.rb
View file @
e7e3d6d2
...
...
@@ -101,15 +101,15 @@ module EE
except:
except_value
}.
compact
end
def
bridge_needs
needs_value
[
:bridge
]
if
needs_value
end
private
def
overwrite_entry
(
deps
,
key
,
current_entry
)
deps
.
default
[
key
]
unless
current_entry
.
specified?
end
def
bridge_needs
needs_value
[
:bridge
]
if
needs_value
end
end
end
end
...
...
lib/gitlab/ci/config/entry/job.rb
View file @
e7e3d6d2
...
...
@@ -115,7 +115,8 @@ module Gitlab
entry
:needs
,
Entry
::
Needs
,
description:
'Needs configuration for this job.'
,
metadata:
{
allowed_needs:
%i[job]
}
metadata:
{
allowed_needs:
%i[job]
},
inherit:
false
entry
:variables
,
Entry
::
Variables
,
description:
'Environment variables available for this job.'
,
...
...
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