diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-27 16:57:49 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-27 16:57:49 +0100 |
commit | 4bfa5e549d7508af1553749efe9c0961961852ea (patch) | |
tree | 85a2fe2410296cf7e25ee1d2dde48e426b47f837 | |
parent | 1d0d949e6964404dd443a9368535c1a11ae7e968 (diff) | |
parent | b9cfe90b5924a2bee6b957672294132151d311ed (diff) | |
download | gitlab-ce-4bfa5e549d7508af1553749efe9c0961961852ea.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | config/gitlab.yml.example | 2 | ||||
-rw-r--r-- | doc/permissions/permissions.md | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index bb0ffae0b70..7b4c180fccc 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -35,7 +35,7 @@ production: &base ## Date & Time settings # Uncomment and customize if you want to change the default time zone of GitLab application. - # To see all available zones, run `bundle exec rake time:zones:all` + # To see all available zones, run `bundle exec rake time:zones:all RAILS_ENV=production` # time_zone: 'UTC' ## Email settings diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index d561868c8bb..e21384d21dc 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -19,6 +19,7 @@ If a user is a GitLab administrator they receive all permissions. | Create new merge request | | | ✓ | ✓ | ✓ | | Create new branches | | | ✓ | ✓ | ✓ | | Push to non-protected branches | | | ✓ | ✓ | ✓ | +| Force push to non-protected branches | | | ✓ | ✓ | ✓ | | Remove non-protected branches | | | ✓ | ✓ | ✓ | | Add tags | | | ✓ | ✓ | ✓ | | Write a wiki | | | ✓ | ✓ | ✓ | @@ -35,6 +36,8 @@ If a user is a GitLab administrator they receive all permissions. | Switch visibility level | | | | | ✓ | | Transfer project to another namespace | | | | | ✓ | | Remove project | | | | | ✓ | +| Force push to protected branches | | | | | | +| Remove protected branches | | | | | | ## Group |