Commit e36baaddcdbf705a4a19d818f91edcb424bf941c

Authored by Dmitriy Zaporozhets
2 parents e8347424 2188392f

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

Showing 1 changed file with 8 additions and 4 deletions   Show diff stats
doc/update/5.4-to-6.0.md
... ... @@ -9,9 +9,13 @@ So you need to move all your global projects under group/users manually before u
9 9  
10 10 #### Teams
11 11  
12   -We drop teams support as separate entity for 6.0 in favor of group membership.
13   -So now you will be able to manage group members in order to provide access to corresponding projects.
14   -
  12 +We deprecate teams as separate entity in 6.0 in favor of group membership.
  13 +The old combination of groups and teams was confusing for a lot of people.
  14 +And when the members of a team where changed this wasn't reflected in the project permissions.
  15 +In GitLab 6.0 you will be able to add members to a group with a permission level for each member.
  16 +These group members will have access to the projects in that group.
  17 +Any changes to group members will immediately be reflected in the project permissions.
  18 +You can even have multiple owners for a group, greatly simplifying administration.
15 19  
16 20 ### 0. Backup
17 21  
... ... @@ -81,4 +85,4 @@ To make sure you didn't miss anything run a more thorough check with:
81 85  
82 86 sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
83 87  
84   -If all items are green, then congratulations upgrade complete!
85 88 \ No newline at end of file
  89 +If all items are green, then congratulations upgrade complete!
... ...