Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-19 17:37:38 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-07-19 17:37:38 +0300
commitd035d735242a47bee7cd5973c9daa7d984800700 (patch)
tree0a1d584bb2836b7b73c7054d85ffff043208d625 /lib/gitlab/user_access.rb
parenta397a0eb1a4c34c27175e2c4e68e7ceb43a81f02 (diff)
Fix tests and fine tweak permission error message
Diffstat (limited to 'lib/gitlab/user_access.rb')
-rw-r--r--lib/gitlab/user_access.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb
index 6c6111006b6..d9a5af09f08 100644
--- a/lib/gitlab/user_access.rb
+++ b/lib/gitlab/user_access.rb
@@ -94,13 +94,15 @@ module Gitlab
def protected_branch_accessible_to?(ref, action:)
ProtectedBranch.protected_ref_accessible_to?(
- ref, user, action: action,
+ ref, user,
+ action: action,
protected_refs: project.protected_branches)
end
def protected_tag_accessible_to?(ref, action:)
ProtectedTag.protected_ref_accessible_to?(
- ref, user, action: action,
+ ref, user,
+ action: action,
protected_refs: project.protected_tags)
end