Commit 96e89ec3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'mention-unicorn' of /home/git/repositories/gitlab/gitlabhq

parents 81c0e163 3bc48458
v 6.0.0 v 6.0.0
- Feature: Replace teams with group membership - 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: Ability to have multiple owners for group
- Feature: Merge Requests between fork and project (Izaak Alpert) - Feature: Merge Requests between fork and project (Izaak Alpert)
- Feature: Generate fingerprint for ssh keys - Feature: Generate fingerprint for ssh keys
...@@ -24,7 +31,7 @@ v 6.0.0 ...@@ -24,7 +31,7 @@ v 6.0.0
- Move all project controllers/views under Projects:: module - Move all project controllers/views under Projects:: module
- Move all profile controllers/views under Profiles:: module - Move all profile controllers/views under Profiles:: module
- Apply user project limit only for personal projects - Apply user project limit only for personal projects
- Unicorn is default web server for new installations - Unicorn is default web server again
- Store satellites lock files inside satellites dir - Store satellites lock files inside satellites dir
- Disabled threadsafety mode in rails - Disabled threadsafety mode in rails
- Fixed bug with loosing MR comments - Fixed bug with loosing MR comments
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
#### Global projects #### Global projects
We deprecated root(global) namespace for 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 #### 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. 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. 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. 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
### 5. Update config files ### 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. Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
* 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.
* 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 ### 6. Update Init script
```bash ```bash
sudo rm /etc/init.d/gitlab 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 sudo chmod +x /etc/init.d/gitlab
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment