summaryrefslogtreecommitdiff
path: root/app/policies
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2016-08-30 11:13:29 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2016-08-30 11:39:22 -0700
commitfb2979260998a1b7f35d688ef788d34099322b84 (patch)
tree6757e6d55684c07c768e919d006522ab8e469bc2 /app/policies
parentd7bd20099bb9df677cf272a5b211fbe9c330c619 (diff)
downloadgitlab-ce-fb2979260998a1b7f35d688ef788d34099322b84.tar.gz
use || in place of `or`
Diffstat (limited to 'app/policies')
-rw-r--r--app/policies/project_policy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 54f5f95cd65..0e933d00904 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -153,7 +153,7 @@ class ProjectPolicy < BasePolicy
cannot!(*named_abilities(:merge_request))
end
- unless project.issues_enabled or project.merge_requests_enabled
+ unless project.issues_enabled || project.merge_requests_enabled
cannot!(*named_abilities(:label))
cannot!(*named_abilities(:milestone))
end