Commit 68942dbb3dcbb41f7d03137f94868d1b662dfd4b

Authored by Marin Jankovski
2 parents 6990f8a8 66c9fa95

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

@@ -13,7 +13,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co @@ -13,7 +13,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
13 - Monitors all issues for feedback (but especially ones commented on since automatically watching them) 13 - Monitors all issues for feedback (but especially ones commented on since automatically watching them)
14 - Closes issues with no feedback from the reporter for two weeks 14 - Closes issues with no feedback from the reporter for two weeks
15 15
16 -### Merge request officers 16 +### Merge marshal
17 17
18 - Responds to merge requests the issue team mentions them in and monitors for new merge requests 18 - Responds to merge requests the issue team mentions them in and monitors for new merge requests
19 - Provides feedback to the merge request submitter to improve the merge request (style, tests, etc.) 19 - Provides feedback to the merge request submitter to improve the merge request (style, tests, etc.)
doc/raketasks/README.md
1 + [Backup restore](backup_restore.md) 1 + [Backup restore](backup_restore.md)
2 + [Cleanup](cleanup.md) 2 + [Cleanup](cleanup.md)
3 -+ [Features](features.md)  
4 + [Maintenance](maintenance.md) and self-checks 3 + [Maintenance](maintenance.md) and self-checks
5 + [User management](user_management.md) 4 + [User management](user_management.md)
6 + [Web hooks](web_hooks.md) 5 + [Web hooks](web_hooks.md)
doc/raketasks/features.md
@@ -1,36 +0,0 @@ @@ -1,36 +0,0 @@
1 -### Enable usernames and namespaces for user projects  
2 -  
3 -This command will enable the namespaces feature introduced in v4.0. It will move every project in its namespace folder.  
4 -  
5 -Note:  
6 -  
7 -* Because the **repository location will change**, you will need to **update all your git url's** to point to the new location.  
8 -* Username can be changed at [Profile / Account](/profile/account)  
9 -  
10 -**Example:**  
11 -  
12 -Old path: `git@example.org:myrepo.git`  
13 -New path: `git@example.org:username/myrepo.git` or `git@example.org:groupname/myrepo.git`  
14 -  
15 -```  
16 -bundle exec rake gitlab:enable_namespaces RAILS_ENV=production  
17 -```  
18 -  
19 -  
20 -### Rebuild project satellites  
21 -  
22 -This command will build missing satellites for projects. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.  
23 -  
24 -```  
25 -bundle exec rake gitlab:satellites:create RAILS_ENV=production  
26 -```  
27 -  
28 -Example output:  
29 -  
30 -```  
31 -Creating satellite for abcd.git  
32 -[git clone output]  
33 -Creating satellite for abcd2.git  
34 -[git clone output]  
35 -done  
36 -```