diff options
| author | Sytse Sijbrandij <sytse@dosire.com> | 2013-08-16 11:53:52 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@dosire.com> | 2013-08-16 11:53:52 +0200 |
| commit | 3bc4845874112242d6e885731c033ffe85ee98dd (patch) | |
| tree | bfd7c9531839e1afec01376118dde4a00db9607d /doc/update/5.4-to-6.0.md | |
| parent | f7b922c687dde96759b119dfaf0a5dd89eb4b9b8 (diff) | |
| download | gitlab-ce-3bc4845874112242d6e885731c033ffe85ee98dd.tar.gz | |
Information about teams in changelog and switching to unicorn for all people.
Diffstat (limited to 'doc/update/5.4-to-6.0.md')
| -rw-r--r-- | doc/update/5.4-to-6.0.md | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md index cf52285c0ec..94799852549 100644 --- a/doc/update/5.4-to-6.0.md +++ b/doc/update/5.4-to-6.0.md @@ -5,11 +5,11 @@ #### Global projects We deprecated root(global) namespace for projects. -So you need to move all your global projects under group/users manually before update or it will be moved automatically to owner namespace during update. +So you need to move all your global projects under group/users manually before update or they will be automatically moved to the owner namespace during the update. #### Teams -We deprecate teams as separate entity in 6.0 in favor of group membership. +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. @@ -67,14 +67,16 @@ sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production ### 5. Update config files -* 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. -* 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. +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://github.com/gitlabhq/gitlabhq/blob/master/config/gitlab.yml.example but with your settings. +* Make `/home/git/gitlab/config/unicorn.rb` the same as https://github.com/gitlabhq/gitlabhq/blob/master/config/unicorn.rb.example but with your settings. ### 6. Update Init script ```bash sudo rm /etc/init.d/gitlab -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-3-stable/lib/support/init.d/gitlab +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab sudo chmod +x /etc/init.d/gitlab ``` |