Permalink
Browse files

Information about teams in changelog and switching to unicorn for all…

… people.
  • Loading branch information...
1 parent f7b922c commit 3bc4845874112242d6e885731c033ffe85ee98dd @dosire dosire committed Aug 16, 2013
Showing with 15 additions and 6 deletions.
  1. +8 −1 CHANGELOG
  2. +7 −5 doc/update/5.4-to-6.0.md
View
@@ -1,5 +1,12 @@
v 6.0.0
- Feature: Replace teams with 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.
+ 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.
- Feature: Ability to have multiple owners for group
- Feature: Merge Requests between fork and project (Izaak Alpert)
- Feature: Generate fingerprint for ssh keys
@@ -24,7 +31,7 @@ v 6.0.0
- Move all project controllers/views under Projects:: module
- Move all profile controllers/views under Profiles:: module
- Apply user project limit only for personal projects
- - Unicorn is default web server for new installations
@xhan

xhan Aug 19, 2013

why switch back to Unicorn again?

@dosire

dosire Aug 19, 2013

Owner

Puma caused 100% CPU and greater memory leaks when running mult-ithreaded on systems with many concurrent users.

@OtaK

OtaK Aug 22, 2013

That's because people used MRI. You MUST use JRuby or Rubynius when using Puma. Or else the world breaks apart.

+ - Unicorn is default web server again
- Store satellites lock files inside satellites dir
- Disabled threadsafety mode in rails
- Fixed bug with loosing MR comments
View
@@ -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
@jab416171

jab416171 Aug 26, 2013

Shouldn't this read 6-0-stable instead of master?

@dosire

dosire Aug 27, 2013

Owner

As you see we frequently forget to update these references, master should be fine for now. But it might be a good idea if we start moving functionality.

@schlamar

schlamar Sep 4, 2013

Could it be that setting it to master breaks the system check, because I get:

Init script up-to-date? ... no
  Try fixing it:
  Redownload the init script
  For more information see:
  doc/install/installation.md in section "Install Init Script"
  Please fix the error above and rerun the checks.
sudo chmod +x /etc/init.d/gitlab
```

0 comments on commit 3bc4845

Please sign in to comment.