summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-17 15:00:14 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-17 15:00:14 -0500
commit08dc38223e0c18233052e04ac95a4f6942fcb1b5 (patch)
treec577dbad8037410cd5736c2d1d639dab19334f41
parent1b3475653f253c62ab493fa62665d8a3e105aa88 (diff)
downloadgitlab-ce-dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow.tar.gz
Rename `not_auth_*` ability methods to `anonymous_*`dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow
-rw-r--r--app/models/ability.rb19
1 files changed, 9 insertions, 10 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f5cd14a89c0..c93139e9039 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,7 +1,7 @@
class Ability
class << self
def allowed(user, subject)
- return not_auth_abilities(user, subject) if user.nil?
+ return anonymous_abilities(user, subject) if user.nil?
return [] unless user.is_a?(User)
return [] if user.blocked?
@@ -19,22 +19,21 @@ class Ability
end.concat(global_abilities(user))
end
- # List of possible abilities
- # for non-authenticated user
- def not_auth_abilities(user, subject)
+ # List of possible abilities for anonymous user
+ def anonymous_abilities(user, subject)
case true
when subject.is_a?(PersonalSnippet)
- not_auth_personal_snippet_abilities(subject)
+ anonymous_personal_snippet_abilities(subject)
when subject.is_a?(Project) || subject.respond_to?(:project)
- not_auth_project_abilities(subject)
+ anonymous_project_abilities(subject)
when subject.is_a?(Group) || subject.respond_to?(:group)
- not_auth_group_abilities(subject)
+ anonymous_group_abilities(subject)
else
[]
end
end
- def not_auth_project_abilities(subject)
+ def anonymous_project_abilities(subject)
project = if subject.is_a?(Project)
subject
else
@@ -62,7 +61,7 @@ class Ability
end
end
- def not_auth_group_abilities(subject)
+ def anonymous_group_abilities(subject)
group = if subject.is_a?(Group)
subject
else
@@ -76,7 +75,7 @@ class Ability
end
end
- def not_auth_personal_snippet_abilities(snippet)
+ def anonymous_personal_snippet_abilities(snippet)
if snippet.public?
[:read_personal_snippet]
else