summaryrefslogtreecommitdiff
path: root/doc/update/5.4-to-6.0.md
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2013-07-30 19:06:45 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2013-07-30 19:06:45 +0200
commitb9717ba45e3b306c091946c43718f6019aed7b33 (patch)
tree518c22715f24e3da45d9924e4052ea39a4c45036 /doc/update/5.4-to-6.0.md
parentc5add8fe55441aa19d424d19fbb2e321f99cb47f (diff)
downloadgitlab-ce-b9717ba45e3b306c091946c43718f6019aed7b33.tar.gz
Add support for reStructured Text markup language
Diffstat (limited to 'doc/update/5.4-to-6.0.md')
-rw-r--r--doc/update/5.4-to-6.0.md17
1 files changed, 12 insertions, 5 deletions
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index 42b9ee50d56..ffc152194db 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -35,7 +35,14 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 6-0-dev
```
-### 3. Install libs, migrations, etc.
+### 3. Install additional packages
+
+```bash
+# For reStructuredText markup language support install required package:
+sudo apt-get install python-docutils
+```
+
+### 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -53,12 +60,12 @@ sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
```
-### 4. Update config files
+### 5. Update config files
* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/puma.rb` same as https://github.com/gitlabhq/gitlabhq/blob/5-3-stable/config/puma.rb.example but with your settings.
-### 5. Update Init script
+### 6. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -66,12 +73,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
sudo chmod +x /etc/init.d/gitlab
```
-### 6. Start application
+### 7. Start application
sudo service gitlab start
sudo service nginx restart
-### 7. Check application status
+### 8. Check application status
Check if GitLab and its environment are configured correctly: