Download as
Browse Code »

Commit 1b491c364d07a6764575fa11430f7c7d1ec6ecd1

Authored by Dmitriy Zaporozhets
2 parents 814a4595 3d3e3913
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Showing 3 changed files with 10 additions and 8 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @1b491c3
... ... @@ -373,7 +373,7 @@ nobody can access your GitLab by using this login information later on.
373 373 ## Additional markup styles
374 374  
375 375 Apart from the always supported markdown style there are other rich text files that GitLab can display.
376   -But you might have to install a depency to do so.
  376 +But you might have to install a dependency to do so.
377 377 Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
378 378 For example, reStructuredText markup language support requires python-docutils:
379 379  
... ...
doc/update/6.7-to-6.8.md
  Diff comments   View file @1b491c3
1   -# From 6.6 to 6.7
  1 +# From 6.7 to 6.8
2 2  
3 3 ### 0. Backup
4 4  
... ... @@ -9,7 +9,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
9 9  
10 10 ### 1. Stop server
11 11  
12   - sudo service gitlab stop
  12 +```bash
  13 +sudo service gitlab stop
  14 +```
13 15  
14 16 ### 2. Get latest code
15 17  
... ... @@ -37,7 +39,7 @@ sudo -u git -H git checkout 6-8-stable-ee
37 39 ```bash
38 40 cd /home/git/gitlab-shell
39 41 sudo -u git -H git fetch
40   -sudo -u git -H git checkout v1.9.1
  42 +sudo -u git -H git checkout v1.9.3
41 43 ```
42 44  
43 45 ### 4. Install libs, migrations, etc.
... ... @@ -114,10 +116,10 @@ To make sure you didn't miss anything run a more thorough check with:
114 116  
115 117 If all items are green, then congratulations upgrade is complete!
116 118  
117   -## Things went south? Revert to previous version (6.6)
  119 +## Things went south? Revert to previous version (6.7)
118 120  
119 121 ### 1. Revert the code to the previous version
120   -Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration
  122 +Follow the [`upgrade guide from 6.6 to 6.7`](6.6-to-6.7.md), except for the database migration
121 123 (The backup is already migrated to the previous version)
122 124  
123 125 ### 2. Restore from the backup:
... ...
doc/update/README.md
  Diff comments   View file @1b491c3
1   -+ [The indivual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
2   -+ [Uprader](upgrader.md)
  1 ++ [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
  2 ++ [Upgrader](upgrader.md)
3 3 + [Ruby](ruby.md)
4 4 + [Patch versions](patch_versions.md)
5 5 + [MySQL to PostgreSQL](mysql_to_postgresql.md)
... ...