broken merge fixed - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
DIR Log
DIR Files
DIR Refs
DIR README
---
DIR commit 32d42aab1a3f39f7895e9a7909e5441306b875f2
DIR parent ee2f86a09197ed0706279b394347fbc1ec43f634
HTML Author: Jay Scott <jay@beardyjay.co.uk>
Date: Fri, 26 Aug 2016 12:14:45 +0000
broken merge fixed
Diffstat:
M app/controllers/jobs_controller.rb | 12 ------------
M config/environments/production.rb | 4 ----
2 files changed, 0 insertions(+), 16 deletions(-)
---
DIR diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
@@ -35,15 +35,9 @@ class JobsController < ApplicationController
@job = Job.find(params[:id])
@call_results = {
-<<<<<<< HEAD
- Timeout: @job.calls.count(conditions: { answered: false }),
- Busy: @job.calls.count(conditions: { busy: true }),
- Answered: @job.calls.count(conditions: { answered: true })
-=======
:Timeout => @job.calls.where(:answered => false ).count,
:Busy => @job.calls.where(:busy => true).count,
:Answered => @job.calls.where(:answered => true).count,
->>>>>>> a2c220956e092cd5bad321f827e7d3663276c312
}
@@ -150,18 +144,12 @@ class JobsController < ApplicationController
end
def purge_calls
-<<<<<<< HEAD
- Call.delete_all(id: params[:result_ids])
- CallMedium.delete_all(call_id: params[:result_ids])
- flash[:notice] = "Purged #{params[:result_ids].length} calls"
-=======
unless params[:result_ids].blank?
Call.delete_all(:id => params[:result_ids])
CallMedium.delete_all(:call_id => params[:result_ids])
flash[:notice] = "Purged #{params[:result_ids].length} calls"
end
->>>>>>> a2c220956e092cd5bad321f827e7d3663276c312
if params[:id]
@job = Job.find(params[:id])
redirect_to view_results_path(@job.project_id, @job.id)
DIR diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -23,11 +23,7 @@ Rails.application.configure do
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
-<<<<<<< HEAD
- config.assets.compile = true
-=======
config.assets.compile = false
->>>>>>> a2c220956e092cd5bad321f827e7d3663276c312
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb