summaryrefslogtreecommitdiff
path: root/doc/install/README.md
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-04-03 19:50:28 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-04-03 19:50:28 +0800
commit1fe57d3f01f8fc7a6f0f71e63d0562512d1e5506 (patch)
tree0f1945a23ccb3fa5b2aee255f24cab2d314cc798 /doc/install/README.md
parent437f59c2fe326552f27fc13289cb2b727f173baa (diff)
parent98278abd590198832c09445ee69df4df6cd006a2 (diff)
downloadgitlab-ce-1fe57d3f01f8fc7a6f0f71e63d0562512d1e5506.tar.gz
Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests
* upstream/master: (147 commits) Replace the `project/issues/issues.feature` spinach test with an rspec analog [Rails5] Isolate `test_after_commit` gem backport missing object storage worker specs Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown" Add button type to settings toggle Move Sidekiq exporter logs to log/sidekiq_exporter.log Rename allow_private_networks to allow_local_network Make error messages even more descriptive Added rescue to show a custom error when testing project integrations Raise more descriptive errors when URLs are blocked Backport changes in EE MR 4972: System Header and Footer Adds validators and rack cookie helper apply feedback add changelog fix the rake task from being to strict about Group Bump html-pipeline to 2.7.1 Update docs for API for issue and merge request description templates Add pagination docs to commit status API Update brakeman 3.6.1 to 4.2.1 Handle CR-LFs properly in .gitmodules file ...
Diffstat (limited to 'doc/install/README.md')
-rw-r--r--doc/install/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/README.md b/doc/install/README.md
index 87f6969b415..9724b56910d 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -36,7 +36,7 @@ the full process of installing GitLab on Google Container Engine (GKE), pushing
- [Install on AWS](https://about.gitlab.com/aws/)
- _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md) -
Quickly test any version of GitLab on DigitalOcean using Docker Machine.
-- [Getting started with GitLab and DigitalOcean](ttps://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/): requirements, installation process, updates.
+- [Getting started with GitLab and DigitalOcean](https://about.gitlab.com/2016/04/27/getting-started-with-gitlab-and-digitalocean/): requirements, installation process, updates.
- [Demo: Cloud Native Development with GitLab](https://about.gitlab.com/2017/04/18/cloud-native-demo/): video demonstration on how to install GitLab on Kubernetes, build a project, create Review Apps, store Docker images in Container Registry, deploy to production on Kubernetes, and monitor with Prometheus.
## Database