Download as
Browse Code »

Commit 3bc4845874112242d6e885731c033ffe85ee98dd

Authored by Sytse Sijbrandij
1 parent f7b922c6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Information about teams in changelog and switching to unicorn for all people.

Showing 2 changed files with 15 additions and 6 deletions   Show diff stats
1 v 6.0.0 1 v 6.0.0
2 - Feature: Replace teams with group membership 2 - Feature: Replace teams with group membership
  3 + We introduce group membership in 6.0 as a replacement for teams.
  4 + The old combination of groups and teams was confusing for a lot of people.
  5 + And when the members of a team where changed this wasn't reflected in the project permissions.
  6 + In GitLab 6.0 you will be able to add members to a group with a permission level for each member.
  7 + These group members will have access to the projects in that group.
  8 + Any changes to group members will immediately be reflected in the project permissions.
  9 + You can even have multiple owners for a group, greatly simplifying administration.
3 - Feature: Ability to have multiple owners for group 10 - Feature: Ability to have multiple owners for group
4 - Feature: Merge Requests between fork and project (Izaak Alpert) 11 - Feature: Merge Requests between fork and project (Izaak Alpert)
5 - Feature: Generate fingerprint for ssh keys 12 - Feature: Generate fingerprint for ssh keys
@@ -24,7 +31,7 @@ v 6.0.0 @@ -24,7 +31,7 @@ v 6.0.0
24 - Move all project controllers/views under Projects:: module 31 - Move all project controllers/views under Projects:: module
25 - Move all profile controllers/views under Profiles:: module 32 - Move all profile controllers/views under Profiles:: module
26 - Apply user project limit only for personal projects 33 - Apply user project limit only for personal projects
27 - - Unicorn is default web server for new installations 34 + - Unicorn is default web server again
28 - Store satellites lock files inside satellites dir 35 - Store satellites lock files inside satellites dir
29 - Disabled threadsafety mode in rails 36 - Disabled threadsafety mode in rails
30 - Fixed bug with loosing MR comments 37 - Fixed bug with loosing MR comments
doc/update/5.4-to-6.0.md
  Diff comments   View file @3bc4845
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
5 #### Global projects 5 #### Global projects
6 6
7 We deprecated root(global) namespace for projects. 7 We deprecated root(global) namespace for projects.
8 -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. 8 +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.
9 9
10 #### Teams 10 #### Teams
11 11
12 -We deprecate teams as separate entity in 6.0 in favor of group membership. 12 +We introduce group membership in 6.0 as a replacement for teams.
13 The old combination of groups and teams was confusing for a lot of people. 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. 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. 15 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 @@ -67,14 +67,16 @@ sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production
67 67
68 ### 5. Update config files 68 ### 5. Update config files
69 69
70 -* 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.  
71 -* 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. 70 +Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
  71 +
  72 +* 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.
  73 +* 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.
72 74
73 ### 6. Update Init script 75 ### 6. Update Init script
74 76
75 ```bash 77 ```bash
76 sudo rm /etc/init.d/gitlab 78 sudo rm /etc/init.d/gitlab
77 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5-3-stable/lib/support/init.d/gitlab 79 +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab
78 sudo chmod +x /etc/init.d/gitlab 80 sudo chmod +x /etc/init.d/gitlab
79 ``` 81 ```
80 82