use || in place of `or`

fb297926 · http://jneen.net/ · d7bd2009 · fb297926
Commit fb297926 authored Aug 30, 2016 by http://jneen.net/
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/policies/project_policy.rb app/policies/project_policy.rb +1 -1

No files found.
--- 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