diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 12:18:13 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 12:18:13 +0300 |
| commit | fa890604aaf15b9e4f0199e6a4cff24c29955a37 (patch) | |
| tree | 1606c5585a93d3c0449effbe7b5cc901900833dd /app/services/git_push_service.rb | |
| parent | 0b97b42d60a662c0d138c44f6dbd05a3048ac349 (diff) | |
| parent | 95b9421ad3b2678da6e0af0131eafd52cdd0b2a5 (diff) | |
Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics
Diffstat (limited to 'app/services/git_push_service.rb')
| -rw-r--r-- | app/services/git_push_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index 2aab67b4b9d..cde993221ff 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -87,7 +87,7 @@ class GitPushService < BaseService project.change_head(branch_name) # Set protection on the default branch if configured - if current_application_settings.default_branch_protection != PROTECTION_NONE + if current_application_settings.default_branch_protection != PROTECTION_NONE && !@project.protected_branch?(@project.default_branch) params = { name: @project.default_branch, |