Commit 1b491c36 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 814a4595 3d3e3913
...@@ -373,7 +373,7 @@ nobody can access your GitLab by using this login information later on. ...@@ -373,7 +373,7 @@ nobody can access your GitLab by using this login information later on.
## Additional markup styles ## Additional markup styles
Apart from the always supported markdown style there are other rich text files that GitLab can display. Apart from the always supported markdown style there are other rich text files that GitLab can display.
But you might have to install a depency to do so. But you might have to install a dependency to do so.
Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
For example, reStructuredText markup language support requires python-docutils: For example, reStructuredText markup language support requires python-docutils:
......
# From 6.6 to 6.7 # From 6.7 to 6.8
### 0. Backup ### 0. Backup
...@@ -9,7 +9,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ...@@ -9,7 +9,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
### 1. Stop server ### 1. Stop server
sudo service gitlab stop ```bash
sudo service gitlab stop
```
### 2. Get latest code ### 2. Get latest code
...@@ -37,7 +39,7 @@ sudo -u git -H git checkout 6-8-stable-ee ...@@ -37,7 +39,7 @@ sudo -u git -H git checkout 6-8-stable-ee
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.1 sudo -u git -H git checkout v1.9.3
``` ```
### 4. Install libs, migrations, etc. ### 4. Install libs, migrations, etc.
...@@ -114,10 +116,10 @@ To make sure you didn't miss anything run a more thorough check with: ...@@ -114,10 +116,10 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations upgrade is complete! If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.6) ## Things went south? Revert to previous version (6.7)
### 1. Revert the code to the previous version ### 1. Revert the code to the previous version
Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration Follow the [`upgrade guide from 6.6 to 6.7`](6.6-to-6.7.md), except for the database migration
(The backup is already migrated to the previous version) (The backup is already migrated to the previous version)
### 2. Restore from the backup: ### 2. Restore from the backup:
......
+ [The indivual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update) + [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
+ [Uprader](upgrader.md) + [Upgrader](upgrader.md)
+ [Ruby](ruby.md) + [Ruby](ruby.md)
+ [Patch versions](patch_versions.md) + [Patch versions](patch_versions.md)
+ [MySQL to PostgreSQL](mysql_to_postgresql.md) + [MySQL to PostgreSQL](mysql_to_postgresql.md)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment