From bc16f81321b69b829c432af72840a4529ce3228a Mon Sep 17 00:00:00 2001 From: Robert Djurasaj Date: Tue, 25 Nov 2014 11:18:56 -0700 Subject: [PATCH 1/2] Update time zone rake task for production. Resolves #8387 --- config/gitlab.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index bb0ffae0b7..7b4c180fcc 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 From 226819c8d171d3fd6f4c5d87649b460d84de6fa9 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Wed, 26 Nov 2014 12:19:19 -0800 Subject: [PATCH 2/2] add details on protected branches Add some details from https://about.gitlab.com/2014/11/26/keeping-your-code-protected/: Who can: * Force push to non-protected branches * Force push to protected branches * Remove protected branches --- doc/permissions/permissions.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index d561868c8b..e21384d21d 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