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
df095d7d
Commit
df095d7d
authored
Jun 21, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comments to explain some culprit; Add changelog
parent
1a193d04
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
app/models/ci/build.rb
app/models/ci/build.rb
+9
-2
changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
+4
-0
No files found.
app/models/ci/build.rb
View file @
df095d7d
...
@@ -192,7 +192,7 @@ module Ci
...
@@ -192,7 +192,7 @@ module Ci
slugified
.
gsub
(
/[^a-z0-9]/
,
'-'
)[
0
..
62
]
slugified
.
gsub
(
/[^a-z0-9]/
,
'-'
)[
0
..
62
]
end
end
# Variables whose value does not depend on
other variables
# Variables whose value does not depend on
environment
def
simple_variables
def
simple_variables
variables
=
predefined_variables
variables
=
predefined_variables
variables
+=
project
.
predefined_variables
variables
+=
project
.
predefined_variables
...
@@ -207,7 +207,8 @@ module Ci
...
@@ -207,7 +207,8 @@ module Ci
variables
variables
end
end
# All variables, including those dependent on other variables
# All variables, including those dependent on environment, which could
# contain unexpanded variables.
def
variables
def
variables
simple_variables
.
concat
(
persisted_environment_variables
)
simple_variables
.
concat
(
persisted_environment_variables
)
end
end
...
@@ -482,6 +483,12 @@ module Ci
...
@@ -482,6 +483,12 @@ module Ci
variables
=
persisted_environment
.
predefined_variables
variables
=
persisted_environment
.
predefined_variables
if
url
=
environment_url
if
url
=
environment_url
# Note that CI_ENVIRONMENT_URL should be the last variable, because
# here we're passing unexpanded environment_url for runner to expand,
# and the runner would expand in order. In order to make sure that
# CI_ENVIRONMENT_URL has everything available, such as variables
# from Environment#predefined_variables, we need to make sure it's
# the last variable.
variables
<<
{
key:
'CI_ENVIRONMENT_URL'
,
value:
url
,
public:
true
}
variables
<<
{
key:
'CI_ENVIRONMENT_URL'
,
value:
url
,
public:
true
}
end
end
...
...
changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
0 → 100644
View file @
df095d7d
---
title
:
Fix passing CI_ENVIRONMENT_NAME and CI_ENVIRONMENT_SLUG for CI_ENVIRONMENT_URL
merge_request
:
12344
author
:
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