Download as
Browse Code »

Commit b9717ba45e3b306c091946c43718f6019aed7b33

Authored by Robert Schilling
1 parent c5add8fe
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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 @b9717ba
... ... @@ -71,6 +71,9 @@ Make sure you have the right version of Python installed.
71 71 # If you get a "command not found" error create a link to the python binary
72 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 77 **Note:** In order to receive mail notifications, make sure to install a
75 78 mail server. By default, Debian is shipped with exim4 whereas Ubuntu
76 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 @b9717ba
... ... @@ -35,7 +35,14 @@ sudo -u git -H git fetch
35 35 sudo -u git -H git checkout 6-0-dev
36 36 ```
37 37  
38   -### 3. Install libs, migrations, etc.
  38 +### 3. Install additional packages
  39 +
  40 +```bash
  41 +# For reStructuredText markup language support install required package:
  42 +sudo apt-get install python-docutils
  43 +```
  44 +
  45 +### 4. Install libs, migrations, etc.
39 46  
40 47 ```bash
41 48 cd /home/git/gitlab
... ... @@ -53,12 +60,12 @@ sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
53 60  
54 61 ```
55 62  
56   -### 4. Update config files
  63 +### 5. Update config files
57 64  
58 65 * 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.
59 66 * 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.
60 67  
61   -### 5. Update Init script
  68 +### 6. Update Init script
62 69  
63 70 ```bash
64 71 sudo rm /etc/init.d/gitlab
... ... @@ -66,12 +73,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
66 73 sudo chmod +x /etc/init.d/gitlab
67 74 ```
68 75  
69   -### 6. Start application
  76 +### 7. Start application
70 77  
71 78 sudo service gitlab start
72 79 sudo service nginx restart
73 80  
74   -### 7. Check application status
  81 +### 8. Check application status
75 82  
76 83 Check if GitLab and its environment are configured correctly:
77 84  
... ...