summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-11 15:32:12 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-03-12 00:03:01 -0500
commitaff1058c61cb8bc2ffbec42babb935828aa766ec (patch)
tree5af9ce4b906eb2599047b4c62902590148ddcc1c
parent25c2349200153db914ab498bb4b14099a79db01a (diff)
downloadgitlab-ce-rs-prepare-8-6.tar.gz
Fix ordering in 8.5-to-8.6 update guiders-prepare-8-6
[ci skip]
-rw-r--r--doc/update/8.5-to-8.6.md24
1 files changed, 13 insertions, 11 deletions
diff --git a/doc/update/8.5-to-8.6.md b/doc/update/8.5-to-8.6.md
index a8167b2cf0b..9a1b94ab369 100644
--- a/doc/update/8.5-to-8.6.md
+++ b/doc/update/8.5-to-8.6.md
@@ -105,35 +105,37 @@ via [/etc/default/gitlab].
[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-6-stable/lib/support/init.d/gitlab.default.example#L37
+#### Init script
+
+Ensure you're still up-to-date with the latest init script changes:
+
+ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+
### 8. Updates for PostgreSQL Users
Starting with 8.6 users using GitLab in combination with PostgreSQL are required
-to have the "pg_trgm" extension enabled for all GitLab databases. If you're
+to have the `pg_trgm` extension enabled for all GitLab databases. If you're
using GitLab's Omnibus packages there's nothing you'll need to do manually as
this extension is enabled automatically. Users who install GitLab without using
Omnibus (e.g. by building from source) have to enable this extension manually.
To enable this extension run the following SQL command as a PostgreSQL super
user for _every_ GitLab database:
- CREATE EXTENSION IF NOT EXISTS pg_trgm;
+```sql
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+```
Certain operating systems might require the installation of extra packages for
this extension to be available. For example, users using Ubuntu will have to
-install the "postgresql-contrib" package in order for this extension to be
+install the `postgresql-contrib` package in order for this extension to be
available.
-#### Init script
-
-Ensure you're still up-to-date with the latest init script changes:
-
- sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-
-### 8. Start application
+### 9. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+### 10. Check application status
Check if GitLab and its environment are configured correctly: