rubocop

Charcoal-SE · Apr 2, 2018 · 79321bc · 79321bc
1 parent 2fe7437
commit 79321bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
@@ -5,7 +5,7 @@ def self.parse_search_params(params, symbol, user)
     input = params[symbol] || ''
 
     if params[is_regex?(symbol)]
-      operation = if user != nil and user.can_use_regex_search? 
+      operation = if !user.nil? && user.can_use_regex_search?
                     params[is_inverse_regex?(symbol)] ? 'NOT REGEXP' : 'REGEXP'
                   else
                     false

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -253,6 +253,6 @@ def has_pinned_role?(role)
   end
 
   def can_use_regex_search?
-    has_role? :reviewer or moderator_sites.any?
+    has_role? :reviewer || moderator_sites.any?
   end
 end