Download as
Browse Code »

Commit 96e89ec36f583644e325f37285e745f8779922eb

Authored by Dmitriy Zaporozhets
2 parents 81c0e163 3bc48458
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 106 additions and 97 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 @96e89ec
1 -# From 5.4 to 6.0  
2 -  
3 -### Deprecations  
4 -  
5 -#### Global projects  
6 -  
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.  
9 -  
10 -#### Teams  
11 -  
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.  
19 -  
20 -### 0. Backup  
21 -  
22 -It's useful to make a backup just in case things go south:  
23 -(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)  
24 -  
25 -```bash  
26 -cd /home/git/gitlab  
27 -sudo -u git -H RAILS_ENV=production bundle exec rake gitlab:backup:create  
28 -```  
29 -  
30 -### 1. Stop server  
31 -  
32 - sudo service gitlab stop  
33 -  
34 -### 2. Get latest code  
35 -  
36 -```bash  
37 -cd /home/git/gitlab  
38 -sudo -u git -H git fetch  
39 -sudo -u git -H git checkout 6-0-dev  
40 -```  
41 -  
42 -### 3. Install additional packages  
43 -  
44 -```bash  
45 -# For reStructuredText markup language support install required package:  
46 -sudo apt-get install python-docutils  
47 -```  
48 -  
49 -### 4. Install libs, migrations, etc.  
50 -  
51 -```bash  
52 -cd /home/git/gitlab  
53 -  
54 -# MySQL  
55 -sudo -u git -H bundle install --without development test postgres --deployment  
56 -  
57 -#PostgreSQL  
58 -sudo -u git -H bundle install --without development test mysql --deployment  
59 -  
60 -sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production  
61 -sudo -u git -H bundle exec rake migrate_groups RAILS_ENV=production  
62 -sudo -u git -H bundle exec rake migrate_global_projects RAILS_ENV=production  
63 -sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production  
64 -sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production  
65 -  
66 -```  
67 -  
68 -### 5. Update config files  
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.  
72 -  
73 -### 6. Update Init script  
74 -  
75 -```bash  
76 -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  
78 -sudo chmod +x /etc/init.d/gitlab  
79 -```  
80 -  
81 -### 7. Start application  
82 -  
83 - sudo service gitlab start  
84 - sudo service nginx restart  
85 -  
86 -### 8. Check application status  
87 -  
88 -Check if GitLab and its environment are configured correctly:  
89 -  
90 - sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production  
91 -  
92 -To make sure you didn't miss anything run a more thorough check with:  
93 -  
94 - sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production  
95 -  
96 -If all items are green, then congratulations upgrade complete! 1 +# From 5.4 to 6.0
  2 +
  3 +### Deprecations
  4 +
  5 +#### Global projects
  6 +
  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 they will be automatically moved to the owner namespace during the update.
  9 +
  10 +#### Teams
  11 +
  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.
  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.
  19 +
  20 +### 0. Backup
  21 +
  22 +It's useful to make a backup just in case things go south:
  23 +(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
  24 +
  25 +```bash
  26 +cd /home/git/gitlab
  27 +sudo -u git -H RAILS_ENV=production bundle exec rake gitlab:backup:create
  28 +```
  29 +
  30 +### 1. Stop server
  31 +
  32 + sudo service gitlab stop
  33 +
  34 +### 2. Get latest code
  35 +
  36 +```bash
  37 +cd /home/git/gitlab
  38 +sudo -u git -H git fetch
  39 +sudo -u git -H git checkout 6-0-dev
  40 +```
  41 +
  42 +### 3. Install additional packages
  43 +
  44 +```bash
  45 +# For reStructuredText markup language support install required package:
  46 +sudo apt-get install python-docutils
  47 +```
  48 +
  49 +### 4. Install libs, migrations, etc.
  50 +
  51 +```bash
  52 +cd /home/git/gitlab
  53 +
  54 +# MySQL
  55 +sudo -u git -H bundle install --without development test postgres --deployment
  56 +
  57 +#PostgreSQL
  58 +sudo -u git -H bundle install --without development test mysql --deployment
  59 +
  60 +sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
  61 +sudo -u git -H bundle exec rake migrate_groups RAILS_ENV=production
  62 +sudo -u git -H bundle exec rake migrate_global_projects RAILS_ENV=production
  63 +sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
  64 +sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production
  65 +
  66 +```
  67 +
  68 +### 5. Update config files
  69 +
  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.
  74 +
  75 +### 6. Update Init script
  76 +
  77 +```bash
  78 +sudo rm /etc/init.d/gitlab
  79 +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab
  80 +sudo chmod +x /etc/init.d/gitlab
  81 +```
  82 +
  83 +### 7. Start application
  84 +
  85 + sudo service gitlab start
  86 + sudo service nginx restart
  87 +
  88 +### 8. Check application status
  89 +
  90 +Check if GitLab and its environment are configured correctly:
  91 +
  92 + sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
  93 +
  94 +To make sure you didn't miss anything run a more thorough check with:
  95 +
  96 + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
  97 +
  98 +If all items are green, then congratulations upgrade complete!