diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-01-31 14:38:45 -0600 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-31 14:38:45 -0600 |
commit | 5fcbe12730960e93b1d3afe6be846eb9ef570d32 (patch) | |
tree | 79a09bfb5e38f7c366b503d363d561ba98f13799 /doc/ci/environments.md | |
parent | ecdcd1be87e140c144bb2afc861a1dc56b297cdd (diff) | |
parent | 2c358b4b5613d6d398533dc559674da14de3c0d7 (diff) | |
download | gitlab-ce-5fcbe12730960e93b1d3afe6be846eb9ef570d32.tar.gz |
Merge branch 'master' into go-go-gadget-webpack
* master: (83 commits)
Fix small typo on new branch button spec
Abillity to promote project labels to group labels
Update and pin the `jwt` gem to ~> 1.5.6
refactor merge request build service
Update index.md
Clarify that Auto Deploy requires a public project.
cop for gem fetched from a git source
Add CHANGELOG entry
Remove new branch button for confidential issues
Remove flash warning from login page
add complete changelog
Add project ID index to `project_authorizations` table to optimize queries
Fix disable storing of sensitive information when importing a new repo
Fix notification when global=disabled, group=watch
Ensure rake is called within the correct bundle context
Fix 8.16.0 release date.
Improve search within group logic
Add changelog item about new attributes in group api
Update group api doc with full_name and full_path attributes
Add tests for nested groups in search service and search helper
...
Diffstat (limited to 'doc/ci/environments.md')
-rw-r--r-- | doc/ci/environments.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index 98cd29c9567..ef04c537367 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -297,7 +297,7 @@ deploy_review: - echo "Deploy a review app" environment: name: review/$CI_BUILD_REF_NAME - url: https://$CI_BUILD_REF_SLUG.review.example.com + url: https://$CI_ENVIRONMENT_SLUG.example.com only: - branches except: @@ -318,15 +318,15 @@ also contain `/`, or other characters that would be invalid in a domain name or URL, we use `$CI_ENVIRONMENT_SLUG` in the `environment:url` so that the environment can get a specific and distinct URL for each branch. In this case, given a `$CI_BUILD_REF_NAME` of `100-Do-The-Thing`, the URL will be something -like `https://review-100-do-the-4f99a2.example.com`. Again, the way you set up +like `https://100-do-the-4f99a2.example.com`. Again, the way you set up the web server to serve these requests is based on your setup. You could also use `$CI_BUILD_REF_SLUG` in `environment:url`, e.g.: -`https://$CI_BUILD_REF_SLUG.review.example.com`. We use `$CI_ENVIRONMENT_SLUG` +`https://$CI_BUILD_REF_SLUG.example.com`. We use `$CI_ENVIRONMENT_SLUG` here because it is guaranteed to be unique, but if you're using a workflow like [GitLab Flow][gitlab-flow], collisions are very unlikely, and you may prefer environment names to be more closely based on the branch name - the example -above would give you an URL like `https://100-do-the-thing.review.example.com` +above would give you an URL like `https://100-do-the-thing.example.com` Last but not least, we tell the job to run [`only`][only] on branches [`except`][only] master. |