diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-16 21:17:15 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-16 21:17:15 +0100 |
| commit | 45953a4c598d23771079a1efbb69dba65e4e642c (patch) | |
| tree | dc87b760a319b6bce4275eb91793fa6fe6610e88 /app/services/git_push_service.rb | |
| parent | 5b52da9c32842849f0b6430a6a820fc7456b4841 (diff) | |
| parent | f7e08ad0de580e9f27ad5301542f2913c6bb2bff (diff) | |
| download | gitlab-ce-45953a4c598d23771079a1efbb69dba65e4e642c.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-without-slack
Diffstat (limited to 'app/services/git_push_service.rb')
| -rw-r--r-- | app/services/git_push_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index e3f25ff1597..78feb37aa2a 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -91,12 +91,12 @@ class GitPushService < BaseService params = { name: @project.default_branch, - push_access_level_attributes: { + push_access_levels_attributes: [{ access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER - }, - merge_access_level_attributes: { + }], + merge_access_levels_attributes: [{ access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER - } + }] } ProtectedBranches::CreateService.new(@project, current_user, params).execute |