summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-04 12:57:46 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-04 12:57:46 +0100
commitb4c36130cc285ac25caef842040e44898eaf858d (patch)
treea8401b27cec6920b9a6e7fce6592e398bc35c54d /app/models
parent6a5a175d9fd1d72cdaab033eefc4191561e619cc (diff)
downloadgitlab-ce-b4c36130cc285ac25caef842040e44898eaf858d.tar.gz
Rename allow_guest_to_access_builds to public_builds
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ability.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index e1767ed8dd1..a6862f83158 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -64,7 +64,7 @@ class Ability
]
# Allow to read builds by anonymous user if guests are allowed
- rules << :read_build if project.allow_guest_to_access_builds?
+ rules << :read_build if project.public_builds?
rules - project_disabled_features_rules(project)
else
@@ -132,9 +132,9 @@ class Ability
rules.push(*public_project_rules)
end
- # Allow to read builds if guests are allowed
- if team.guest?(user) || project.public? || project.internal?
- rules << :read_build if project.allow_guest_to_access_builds?
+ # Allow to read builds for internal projects
+ if project.public? || project.internal?
+ rules << :read_build if project.public_builds?
end
if project.owner == user || user.admin?
@@ -172,7 +172,6 @@ class Ability
:read_project_member,
:read_merge_request,
:read_note,
- :read_commit_status,
:create_project,
:create_issue,
:create_note
@@ -187,6 +186,7 @@ class Ability
:update_issue,
:admin_issue,
:admin_label,
+ :read_commit_status,
:read_build,
]
end