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:
authorhttp://jneen.net/ <jneen@jneen.net>2016-08-17 01:31:01 +0300
committerhttp://jneen.net/ <jneen@jneen.net>2016-08-24 03:59:38 +0300
commit01d2fd2e0cf8928b7926b7d8eb60576215b23942 (patch)
tree2b6a58a3f5caea67ca1e748e70f07c61d0da59ee
parent04496f2b77884994993f240afa6e82bf6b5f4f10 (diff)
port personal snippets
-rw-r--r--app/models/ability.rb33
1 files changed, 1 insertions, 32 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 323597c8888..c5392379b32 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -73,7 +73,6 @@ class Ability
def abilities_by_subject_class(user:, subject:)
case subject
- when PersonalSnippet then personal_snippet_abilities(user, subject)
when Group then group_abilities(user, subject)
when Namespace then namespace_abilities(user, subject)
when GroupMember then group_member_abilities(user, subject)
@@ -87,11 +86,7 @@ class Ability
# List of possible abilities for anonymous user
def anonymous_abilities(subject)
- if subject.is_a?(PersonalSnippet)
- anonymous_personal_snippet_abilities(subject)
- elsif subject.is_a?(ProjectSnippet)
- anonymous_project_snippet_abilities(subject)
- elsif subject.respond_to?(:project)
+ if subject.respond_to?(:project)
ProjectPolicy.abilities(nil, subject.project)
elsif subject.is_a?(Group) || subject.respond_to?(:group)
anonymous_group_abilities(subject)
@@ -153,14 +148,6 @@ class Ability
rules
end
- def anonymous_personal_snippet_abilities(snippet)
- if snippet.public?
- [:read_personal_snippet]
- else
- []
- end
- end
-
def anonymous_user_abilities
[:read_user] unless restricted_public_level?
end
@@ -232,24 +219,6 @@ class Ability
rules.flatten
end
- def personal_snippet_abilities(user, snippet)
- rules = []
-
- if snippet.author == user
- rules += [
- :read_personal_snippet,
- :update_personal_snippet,
- :admin_personal_snippet
- ]
- end
-
- if snippet.public? || (snippet.internal? && !user.external?)
- rules << :read_personal_snippet
- end
-
- rules
- end
-
def group_member_abilities(user, subject)
rules = []
target_user = subject.user