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
78abf83b
Commit
78abf83b
authored
Jun 14, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
374fddfc
752f303d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
scripts/review_apps/review-apps.sh
scripts/review_apps/review-apps.sh
+1
-0
scripts/trigger-build
scripts/trigger-build
+1
-0
No files found.
scripts/review_apps/review-apps.sh
View file @
78abf83b
...
...
@@ -209,6 +209,7 @@ HELM_CMD=$(cat << EOF
--timeout 600
\
--set global.appConfig.enableUsagePing=false
\
--set releaseOverride="
$CI_ENVIRONMENT_SLUG
"
\
--set global.imagePullPolicy=Always
\
--set global.hosts.hostSuffix="
$HOST_SUFFIX
"
\
--set global.hosts.domain="
$REVIEW_APPS_DOMAIN
"
\
--set certmanager.install=false
\
...
...
scripts/trigger-build
View file @
78abf83b
...
...
@@ -142,6 +142,7 @@ module Trigger
"GITLAB_VERSION"
=>
ENV
[
'CI_COMMIT_REF_NAME'
],
"GITLAB_TAG"
=>
ENV
[
'CI_COMMIT_TAG'
],
"GITLAB_ASSETS_TAG"
=>
ENV
[
'CI_COMMIT_TAG'
]
?
ENV
[
'CI_COMMIT_REF_NAME'
]
:
ENV
[
'CI_COMMIT_REF_SLUG'
],
"FORCE_RAILS_IMAGE_BUILDS"
=>
'true'
,
"
#{
edition
}
_PIPELINE"
=>
'true'
}
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