diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 21:57:30 +0300 |
| commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
| tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /app/services/git_push_service.rb | |
| parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) | |
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Diffstat (limited to 'app/services/git_push_service.rb')
| -rw-r--r-- | app/services/git_push_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index e02b50ff9a2..a886f35981f 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -89,8 +89,7 @@ class GitPushService < BaseService # Set protection on the default branch if configured if current_application_settings.default_branch_protection != PROTECTION_NONE developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false - developers_can_merge = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? true : false - @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push, developers_can_merge: developers_can_merge }) + @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push }) end end |