summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-05-10 22:40:06 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-05-10 22:40:06 +0000
commit62c93ab91218daf176ccbfc1622a6f3c58f1ad82 (patch)
treed61f9eaf2fa19e204aca52501e1fe7981ea75488
parent81df0034f4b66f2627ecd92f0ca44b7a3a634719 (diff)
parent9c7d87ef0ec941b389cb5ef57a07ff0f43909305 (diff)
downloadgitlab-ce-62c93ab91218daf176ccbfc1622a6f3c58f1ad82.tar.gz
Merge branch 'docs/hide-gcp-install' into 'master'
Hide GCP install guide from index page until our image is released Closes omnibus-gitlab#2326 See merge request !11213
-rw-r--r--doc/install/README.md2
-rw-r--r--doc/install/google_cloud_platform/index.md4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/install/README.md b/doc/install/README.md
index 3bf7923a9ee..bc831a37735 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -18,8 +18,6 @@ the hardware requirements.
Useful for unsupported systems like *BSD. For an overview of the directory
structure, read the [structure documentation](structure.md).
- [Docker](https://docs.gitlab.com/omnibus/docker/) - Install GitLab using Docker.
-- [Installation on Google Cloud Platform](google_cloud_platform/index.md) - Install
- GitLab on Google Cloud Platform using our official image.
- [Installing in Kubernetes](kubernetes/index.md) - Install GitLab into a Kubernetes
Cluster using our official Helm Chart Repository.
- Testing only! [DigitalOcean and Docker Machine](digitaloceandocker.md) -
diff --git a/doc/install/google_cloud_platform/index.md b/doc/install/google_cloud_platform/index.md
index 26506111548..35220119e9b 100644
--- a/doc/install/google_cloud_platform/index.md
+++ b/doc/install/google_cloud_platform/index.md
@@ -2,6 +2,10 @@
![GCP landing page](img/gcp_landing.png)
+>**Important note:**
+GitLab has no official images in Google Cloud Platform yet. This guide serves
+as a template for when the GitLab VM will be available.
+
The fastest way to get started on [Google Cloud Platform (GCP)][gcp] is through
the [Google Cloud Launcher][launcher] program.