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
828a15bc
Commit
828a15bc
authored
Jun 10, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename method used to allow node in Ci config
parent
51046dd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
lib/gitlab/ci/config/node/configurable.rb
lib/gitlab/ci/config/node/configurable.rb
+4
-4
lib/gitlab/ci/config/node/global.rb
lib/gitlab/ci/config/node/global.rb
+1
-1
No files found.
lib/gitlab/ci/config/node/configurable.rb
View file @
828a15bc
...
@@ -25,7 +25,7 @@ module Gitlab
...
@@ -25,7 +25,7 @@ module Gitlab
end
end
def
allowed_nodes
def
allowed_nodes
self
.
class
.
nodes
||
{}
self
.
class
.
allowed_
nodes
||
{}
end
end
private
private
...
@@ -46,16 +46,16 @@ module Gitlab
...
@@ -46,16 +46,16 @@ module Gitlab
end
end
class_methods
do
class_methods
do
attr_reader
:nodes
attr_reader
:
allowed_
nodes
private
private
def
a
dd
_node
(
symbol
,
entry_class
,
metadata
)
def
a
llow
_node
(
symbol
,
entry_class
,
metadata
)
node
=
{
symbol
.
to_sym
=>
node
=
{
symbol
.
to_sym
=>
{
class:
entry_class
,
{
class:
entry_class
,
description:
metadata
[
:description
]
}
}
description:
metadata
[
:description
]
}
}
(
@nodes
||=
{}).
merge!
(
node
)
(
@
allowed_
nodes
||=
{}).
merge!
(
node
)
end
end
end
end
end
end
...
...
lib/gitlab/ci/config/node/global.rb
View file @
828a15bc
...
@@ -9,7 +9,7 @@ module Gitlab
...
@@ -9,7 +9,7 @@ module Gitlab
class
Global
<
Entry
class
Global
<
Entry
include
Configurable
include
Configurable
a
dd
_node
:before_script
,
Script
,
a
llow
_node
:before_script
,
Script
,
description:
'Script that will be executed before each job.'
description:
'Script that will be executed before each job.'
end
end
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