summaryrefslogtreecommitdiff
path: root/lib/gitlab/user_access.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-18 21:56:28 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-07-18 21:56:28 +0800
commit679789ee93b0e5db3863bfcd539e20074c140984 (patch)
treeaa998ee09422203ffe40e4076765636bb852f41d /lib/gitlab/user_access.rb
parentc86e74b284826e2f53bbcba763edd113a7022ffc (diff)
downloadgitlab-ce-679789ee93b0e5db3863bfcd539e20074c140984.tar.gz
Rename can_push_or_merge_to_branch? to can_update_branch?
Also make sure pipeline would also check against tag as well
Diffstat (limited to 'lib/gitlab/user_access.rb')
-rw-r--r--lib/gitlab/user_access.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb
index c63b98500ee..25698bb8e99 100644
--- a/lib/gitlab/user_access.rb
+++ b/lib/gitlab/user_access.rb
@@ -54,7 +54,7 @@ module Gitlab
end
end
- def can_push_or_merge_to_branch?(ref)
+ def can_update_branch?(ref)
can_push_to_branch?(ref) || can_merge_to_branch?(ref)
end