enforce coding convention

replaced every `and` by `&&` and every `or` by `||`
2013-03-05 01:42:44 +01:00
parent f544e1d4f7
commit 239cbd2d58
39 changed files with 75 additions and 76 deletions
@@ -1,6 +1,6 @@
 class Admin::ExportController < Admin::AdminController
  def create
-    unless Export.is_export_running? or Import.is_import_running?
+    unless Export.is_export_running? || Import.is_import_running?
      job_id = Jobs.enqueue( :exporter, user_id: current_user.id )
      render json: success_json.merge( job_id: job_id )
    else