diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-24 23:02:14 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-24 23:02:14 +0100 |
| commit | 1f7006c59c88355f6139a1913d491ca0304765c5 (patch) | |
| tree | 562c24f8250065e24e0777c04518e7afbbc6d24f | |
| parent | 6466e330c921c92526b2a505af155d9f3e05a0c7 (diff) | |
| parent | 83ba37e54489268a8c52e158734c13b5976c7dc3 (diff) | |
| download | gitlab-ce-1f7006c59c88355f6139a1913d491ca0304765c5.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slacky-builds-v2
| -rw-r--r-- | doc/development/architecture.md | 2 | ||||
| -rw-r--r-- | doc/permissions/permissions.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 6101a71a8de..12e33406cb6 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -42,7 +42,7 @@ Gitlab-shell communicates with Sidekiq via the “communication board” (Redis) ## System Layout -When referring to ~git in the pictures it means the home directory of the git user which is typically /home/git. +When referring to `~git` in the pictures it means the home directory of the git user which is typically /home/git. GitLab is primarily installed within the `/home/git` user home directory as `git` user. Within the home directory is where the gitlabhq server software resides as well as the repositories (though the repository location is configurable). diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index 168e7d143ee..f717b30c12e 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -26,6 +26,7 @@ documentation](../workflow/add-user/add-user.md). | Create code snippets | | ✓ | ✓ | ✓ | ✓ | | Manage issue tracker | | ✓ | ✓ | ✓ | ✓ | | Manage labels | | ✓ | ✓ | ✓ | ✓ | +| See a commit status | | ✓ | ✓ | ✓ | ✓ | | Manage merge requests | | | ✓ | ✓ | ✓ | | Create new merge request | | | ✓ | ✓ | ✓ | | Create new branches | | | ✓ | ✓ | ✓ | @@ -35,6 +36,7 @@ documentation](../workflow/add-user/add-user.md). | Add tags | | | ✓ | ✓ | ✓ | | Write a wiki | | | ✓ | ✓ | ✓ | | Cancel and retry builds | | | ✓ | ✓ | ✓ | +| Create or update commit status | | | ✓ | ✓ | ✓ | | Create new milestones | | | | ✓ | ✓ | | Add new team members | | | | ✓ | ✓ | | Push to protected branches | | | | ✓ | ✓ | |