Download as
Browse Code »

Commit 8886b900cad751273044d40d9d0eefbe1ea81616

Authored by Dmitriy Zaporozhets
2 parents 2d681c0d b9717ba4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4673 from Razer6/support_restructured_text 

Add support for reStructured Text markup language
Showing 2 changed files with 15 additions and 5 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @8886b90
@@ -71,6 +71,9 @@ Make sure you have the right version of Python installed. @@ -71,6 +71,9 @@ Make sure you have the right version of Python installed.
71 # If you get a "command not found" error create a link to the python binary 71 # If you get a "command not found" error create a link to the python binary
72 sudo ln -s /usr/bin/python /usr/bin/python2 72 sudo ln -s /usr/bin/python /usr/bin/python2
73 73
  74 + # For reStructuredText markup language support install required package:
  75 + sudo apt-get install python-docutils
  76 +
74 **Note:** In order to receive mail notifications, make sure to install a 77 **Note:** In order to receive mail notifications, make sure to install a
75 mail server. By default, Debian is shipped with exim4 whereas Ubuntu 78 mail server. By default, Debian is shipped with exim4 whereas Ubuntu
76 does not ship with one. The recommended mail server is postfix and you can install it with: 79 does not ship with one. The recommended mail server is postfix and you can install it with:
doc/update/5.4-to-6.0.md
  Diff comments   View file @8886b90
@@ -39,7 +39,14 @@ sudo -u git -H git fetch @@ -39,7 +39,14 @@ sudo -u git -H git fetch
39 sudo -u git -H git checkout 6-0-dev 39 sudo -u git -H git checkout 6-0-dev
40 ``` 40 ```
41 41
42 -### 3. Install libs, migrations, etc. 42 +### 3. Install additional packages
  43 +
  44 +```bash
  45 +# For reStructuredText markup language support install required package:
  46 +sudo apt-get install python-docutils
  47 +```
  48 +
  49 +### 4. Install libs, migrations, etc.
43 50
44 ```bash 51 ```bash
45 cd /home/git/gitlab 52 cd /home/git/gitlab
@@ -57,12 +64,12 @@ sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production @@ -57,12 +64,12 @@ sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
57 64
58 ``` 65 ```
59 66
60 -### 4. Update config files 67 +### 5. Update config files
61 68
62 * 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. 69 * 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.
63 * 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. 70 * 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.
64 71
65 -### 5. Update Init script 72 +### 6. Update Init script
66 73
67 ```bash 74 ```bash
68 sudo rm /etc/init.d/gitlab 75 sudo rm /etc/init.d/gitlab
@@ -70,12 +77,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5 @@ -70,12 +77,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
70 sudo chmod +x /etc/init.d/gitlab 77 sudo chmod +x /etc/init.d/gitlab
71 ``` 78 ```
72 79
73 -### 6. Start application 80 +### 7. Start application
74 81
75 sudo service gitlab start 82 sudo service gitlab start
76 sudo service nginx restart 83 sudo service nginx restart
77 84
78 -### 7. Check application status 85 +### 8. Check application status
79 86
80 Check if GitLab and its environment are configured correctly: 87 Check if GitLab and its environment are configured correctly:
81 88