summaryrefslogtreecommitdiff
path: root/doc/update/5.4-to-6.0.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/update/5.4-to-6.0.md')
-rw-r--r--doc/update/5.4-to-6.0.md53
1 files changed, 32 insertions, 21 deletions
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index c289fcb57fd..7bf7bce6aa0 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -1,40 +1,47 @@
# From 5.4 to 6.0
## Warning
+
GitLab 6.0 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-### Deprecations
+## Deprecations
-#### Global projects
+### Global projects
The root (global) namespace for projects is deprecated.
+
So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote url. Please make sure you disable sending email when you do a test of the upgrade.
-#### Teams
+### Teams
We introduce group membership in 6.0 as a replacement for teams.
+
The old combination of groups and teams was confusing for a lot of people.
+
And when the members of a team where changed this wasn't reflected in the project permissions.
+
In GitLab 6.0 you will be able to add members to a group with a permission level for each member.
+
These group members will have access to the projects in that group.
+
Any changes to group members will immediately be reflected in the project permissions.
+
You can even have multiple owners for a group, greatly simplifying administration.
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -42,7 +49,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 6-0-stable
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -50,14 +57,14 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9
```
-### 4. Install additional packages
+## 4. Install additional packages
```bash
# For reStructuredText markup language support install required package:
sudo apt-get install python-docutils
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -83,14 +90,14 @@ sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 6. Update config files
+## 6. Update config files
Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings.
-### 7. Update Init script
+## 7. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -98,12 +105,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -115,20 +122,24 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations upgrade complete!
-### Troubleshooting
+## Troubleshooting
+
The migrations in this update are very sensitive to incomplete or inconsistent data. If you have a long-running GitLab installation and some of the previous upgrades did not work out 100% correct this may bite you now. The following commands can be run in the rails console to look for 'bad' data.
-All project owners should have an owner
+All project owners should have an owner:
+
```
Project.all.select { |project| project.owner.blank? }
```
-Every user should have a namespace
+Every user should have a namespace:
+
```
User.all.select { |u| u.namespace.blank? }
```
-Projects in the global namespace should not conflict with projects in the owner namespace
+Projects in the global namespace should not conflict with projects in the owner namespace:
+
```
Project.where(namespace_id: nil).select { |p| Project.where(path: p.path, namespace_id: p.owner.try(:namespace).try(:id)).present? }
```