summaryrefslogtreecommitdiff
path: root/app/models/protected_branch.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/protected_branch.rb')
-rw-r--r--app/models/protected_branch.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index b0fde6c6c1b..c0bee72b4d7 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -12,12 +12,12 @@ class ProtectedBranch < ActiveRecord::Base
project.commit(self.name)
end
- def developers_can_push
- self.push_access_level && self.push_access_level.developers?
+ def allowed_to_push
+ self.push_access_level && self.push_access_level.access_level
end
- def developers_can_merge
- self.merge_access_level && self.merge_access_level.developers?
+ def allowed_to_merge
+ self.merge_access_level && self.merge_access_level.access_level
end
# Returns all protected branches that match the given branch name.