diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
| commit | 83ad5de637b884d97b3350a468b9a66c71507dca (patch) | |
| tree | 6344200848b6da6b24a1fdbdb3cc2c4745ee6366 /doc/topics/autodevops/index.md | |
| parent | 7f5703484b957718d4f9f576cf8ac22acc45c8de (diff) | |
| parent | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (diff) | |
| download | gitlab-ce-83ad5de637b884d97b3350a468b9a66c71507dca.tar.gz | |
Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keeping
* master: (47 commits)
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
i18n: document how to use links without splitting sentences
Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
Add CI job to check Gemfile.rails5.lock
Add navigation theme documentation
Move Gitaly branch/tag/ref RPC's to opt-out
Add CI_{PIPELINE,JOB}_URL
Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project""
fixed/enhanced command-line documentation
Use nip.io instead of xip.io
[Rails5] Update Gitlab.rails5.lock
Fix typo in doc/development/README.md
Update import screenshot without LFS warning
Hide overflow on hr
Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"
Fix collapse sidebar button color
Remove .row and .col-sm-12
Relax expectation in spec/models/project_spec.rb
fix padding in commit info
GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong
...
Diffstat (limited to 'doc/topics/autodevops/index.md')
| -rw-r--r-- | doc/topics/autodevops/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index fe6a88b1df7..103836e59d0 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -135,9 +135,9 @@ and `1.2.3.4` is the IP address of your load balancer; generally NGINX ([see requirements](#requirements)). How to set up the DNS record is beyond the scope of this document; you should check with your DNS provider. -Alternatively you can use free public services like [xip.io](http://xip.io) or +Alternatively you can use free public services like [nip.io](http://nip.io) or [nip.io](http://nip.io) which provide automatic wildcard DNS without any -configuration. Just set the Auto DevOps base domain to `1.2.3.4.xip.io` or +configuration. Just set the Auto DevOps base domain to `1.2.3.4.nip.io` or `1.2.3.4.nip.io`. Once set up, all requests will hit the load balancer, which in turn will route |