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

PROCESS.md

@@ -13,7 +13,7 @@ Below we describe the contributing process to GitLab for two reasons. So that co
 - Monitors all issues for feedback (but especially ones commented on since automatically watching them)
 - Closes issues with no feedback from the reporter for two weeks
 
-### Merge request officers
+### Merge marshal
 
 - Responds to merge requests the issue team mentions them in and monitors for new merge requests
 - Provides feedback to the merge request submitter to improve the merge request (style, tests, etc.)

doc/raketasks/README.md

@@ -1,6 +1,5 @@
 + [Backup restore](backup_restore.md)
 + [Cleanup](cleanup.md)
-+ [Features](features.md)
 + [Maintenance](maintenance.md) and self-checks
 + [User management](user_management.md)
 + [Web hooks](web_hooks.md)

doc/raketasks/features.md

@@ -1,36 +0,0 @@
-### Enable usernames and namespaces for user projects
-
-This command will enable the namespaces feature introduced in v4.0. It will move every project in its namespace folder.
-
-Note:
-
-* Because the **repository location will change**, you will need to **update all your git url's** to point to the new location.
-* Username can be changed at [Profile / Account](/profile/account)
-
-**Example:**
-
-Old path: `git@example.org:myrepo.git`
-New path: `git@example.org:username/myrepo.git` or `git@example.org:groupname/myrepo.git`
-
-```
-bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
-```
-
-
-### Rebuild project satellites
-
-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**.
-
-```
-bundle exec rake gitlab:satellites:create RAILS_ENV=production
-```
-
-Example output:
-
-```
-Creating satellite for abcd.git
-[git clone output]
-Creating satellite for abcd2.git
-[git clone output]
-done
-```