diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-23 09:14:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-23 09:14:14 +0000 |
| commit | f4bc6ec92e2af0b6cfd64f9ff0ca683bf62820d1 (patch) | |
| tree | 9e34a9a071d0c0c5900c0ba37927de4590fa23f9 /app/models/project.rb | |
| parent | 0a8aebcb550b705ec5987c6f905eaf5c5abb1cc1 (diff) | |
| parent | 08266ba0a14ec296b51cda6b54d1648985a11adf (diff) | |
| download | gitlab-ce-f4bc6ec92e2af0b6cfd64f9ff0ca683bf62820d1.tar.gz | |
Merge branch 'bvl-external-auth-port' into 'master'
Port `read_cross_project` ability from EE
See merge request gitlab-org/gitlab-ce!17208
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 4ad6f025e5c..ba278a49688 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1037,6 +1037,9 @@ class Project < ActiveRecord::Base end def user_can_push_to_empty_repo?(user) + return false unless empty_repo? + return false unless Ability.allowed?(user, :push_code, self) + !ProtectedBranch.default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER end |