summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-11 20:09:09 +0000
committerRobert Speicher <robert@gitlab.com>2017-04-11 20:09:09 +0000
commit26a3da8c51d343ea0bcde85b424270d7ce23f82e (patch)
tree751b393eae5d9c423b15ff3769369cd3e6b6cfe5
parentb728e30e812fe277731df7e2f88663b3446f9872 (diff)
parent2deef3feea68709810baf46ca77d5dadcddbc858 (diff)
downloadgitlab-ce-26a3da8c51d343ea0bcde85b424270d7ce23f82e.tar.gz
Merge branch 'update-doc-installation-and-upgrade' into 'master'
Update installation and upgrading guides [ci skip] See merge request !10621
-rw-r--r--doc/install/installation.md6
-rw-r--r--doc/update/9.0-to-9.1.md4
2 files changed, 3 insertions, 7 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 5b72c2cce07..1f61a4f67bb 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -289,9 +289,9 @@ sudo usermod -aG redis git
### Clone the Source
# Clone GitLab repository
- sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 9-0-stable gitlab
+ sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 9-1-stable gitlab
-**Note:** You can change `9-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `9-1-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
### Configure It
@@ -475,7 +475,7 @@ with setting up Gitaly until you upgrade to GitLab 9.2 or later.
sudo -u git cp config.toml.example config.toml
# If you are using non-default settings you need to update config.toml
sudo -u git -H editor config.toml
-
+
# Enable Gitaly in the init script
echo 'gitaly_enabled=true' | sudo tee -a /etc/default/gitlab
diff --git a/doc/update/9.0-to-9.1.md b/doc/update/9.0-to-9.1.md
index ae983dea384..1191662ee14 100644
--- a/doc/update/9.0-to-9.1.md
+++ b/doc/update/9.0-to-9.1.md
@@ -1,9 +1,5 @@
# From 9.0 to 9.1
-** TODO: **
-
-# TODO clean out 9.0-specific stuff
-
Make sure you view this update guide from the tag (version) of GitLab you would
like to install. In most cases this should be the highest numbered production
tag (without rc in it). You can select the tag in the version dropdown at the