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
20dcd522
Commit
20dcd522
authored
Jun 01, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't make this change for now to reduce conflicts
parent
99b142bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app/models/ci/build.rb
app/models/ci/build.rb
+9
-9
No files found.
app/models/ci/build.rb
View file @
20dcd522
...
@@ -193,15 +193,15 @@ module Ci
...
@@ -193,15 +193,15 @@ module Ci
# Variables whose value does not depend on other variables
# Variables whose value does not depend on other variables
def
simple_variables
def
simple_variables
variables
=
predefined_variables
variables
=
predefined_variables
variables
.
concat
(
project
.
predefined_variables
)
variables
+=
project
.
predefined_variables
variables
.
concat
(
pipeline
.
predefined_variables
)
variables
+=
pipeline
.
predefined_variables
variables
.
concat
(
runner
.
predefined_variables
)
if
runner
variables
+=
runner
.
predefined_variables
if
runner
variables
.
concat
(
project
.
container_registry_variables
)
variables
+=
project
.
container_registry_variables
variables
.
concat
(
project
.
deployment_variables
)
if
has_environment?
variables
+=
project
.
deployment_variables
if
has_environment?
variables
.
concat
(
yaml_variables
)
variables
+=
yaml_variables
variables
.
concat
(
user_variables
)
variables
+=
user_variables
variables
.
concat
(
project
.
secret_variables
)
variables
+=
project
.
secret_variables
variables
.
concat
(
trigger_request
.
user_variables
)
if
trigger_request
variables
+=
trigger_request
.
user_variables
if
trigger_request
variables
variables
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