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 02:29:10 +0300
committerhttp://jneen.net/ <jneen@jneen.net>2016-08-24 03:59:38 +0300
commit1a3c1ca8e8f3a7b0f66c77c0819a843a49a8568c (patch)
tree40c9906db652f0bfa975fd2478db2ef507c8c059
parent2a7fd24ff8a3305b2866931a4b8ae42d0f5300de (diff)
trim more dead code
-rw-r--r--app/models/ability.rb53
1 files changed, 1 insertions, 52 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 2360bf3d46c..794fb1223e3 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -96,57 +96,6 @@ class Ability
end
end
- def anonymous_project_abilities(subject)
- project = if subject.is_a?(Project)
- subject
- else
- subject.project
- end
-
- if project && project.public?
- rules = [
- :read_project,
- :read_board,
- :read_list,
- :read_wiki,
- :read_label,
- :read_milestone,
- :read_project_snippet,
- :read_project_member,
- :read_merge_request,
- :read_note,
- :read_pipeline,
- :read_commit_status,
- :read_container_image,
- :download_code
- ]
-
- # Allow to read builds by anonymous user if guests are allowed
- rules << :read_build if project.public_builds?
-
- # Allow to read issues by anonymous user if issue is not confidential
- rules << :read_issue unless subject.is_a?(Issue) && subject.confidential?
-
- rules - project_disabled_features_rules(project)
- else
- []
- end
- end
-
- def anonymous_group_abilities(subject)
- rules = []
-
- group = if subject.is_a?(Group)
- subject
- else
- subject.group
- end
-
- rules << :read_group if group.public?
-
- rules
- end
-
def anonymous_user_abilities
[:read_user] unless restricted_public_level?
end
@@ -211,7 +160,7 @@ class Ability
project = subject.project
unless target_user == project.owner
- can_manage = project_abilities(user, project).include?(:admin_project_member)
+ can_manage = allowed?(user, :admin_project_member, project)
if can_manage
rules << :update_project_member