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
Boxiang Sun
gitlab-ce
Commits
3dec6e26
Commit
3dec6e26
authored
Apr 15, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename method that returns global envs in CI conf
parent
b7946b50
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-1
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+1
-1
No files found.
app/models/ci/build.rb
View file @
3dec6e26
...
@@ -372,7 +372,7 @@ module Ci
...
@@ -372,7 +372,7 @@ module Ci
def
global_yaml_variables
def
global_yaml_variables
if
commit
.
config_processor
if
commit
.
config_processor
commit
.
config_processor
.
variables
.
map
do
|
key
,
value
|
commit
.
config_processor
.
global_
variables
.
map
do
|
key
,
value
|
{
key:
key
,
value:
value
,
public:
true
}
{
key:
key
,
value:
value
,
public:
true
}
end
end
else
else
...
...
lib/ci/gitlab_ci_yaml_processor.rb
View file @
3dec6e26
...
@@ -40,7 +40,7 @@ module Ci
...
@@ -40,7 +40,7 @@ module Ci
@stages
||
DEFAULT_STAGES
@stages
||
DEFAULT_STAGES
end
end
def
variables
def
global_
variables
@variables
@variables
end
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
3dec6e26
...
@@ -359,7 +359,7 @@ module Ci
...
@@ -359,7 +359,7 @@ module Ci
})
})
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
expect
(
config_processor
.
variables
).
to
eq
(
variables
)
expect
(
config_processor
.
global_
variables
).
to
eq
(
variables
)
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