* fix changes to resque-scheduler includes

This commit is contained in:
Seth Call 2014-07-27 12:46:20 -05:00
parent 750bceec2e
commit 2f76a82bd3
4 changed files with 6 additions and 4 deletions

View File

@ -2,7 +2,10 @@
# Add your own tasks in files placed in lib/tasks ending in .rake, # Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
#require 'resque/tasks'
#require 'resque/scheduler/tasks'
require 'resque/tasks' require 'resque/tasks'
require 'resque/scheduler/tasks'
require File.expand_path('../config/application', __FILE__) require File.expand_path('../config/application', __FILE__)
SampleApp::Application.load_tasks SampleApp::Application.load_tasks

View File

@ -16,7 +16,7 @@
<!-- @end sort filter --> <!-- @end sort filter -->
<% else %> <% else %>
<!-- @begin order by filter --> <!-- @begin order by filter -->
<%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %> <%= content_tag(:div, 'Order By:', :class => 'filter-element desc') %>
<%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by easydropdown"} ) %> <%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by easydropdown"} ) %>
<!-- @end order by filter --> <!-- @end order by filter -->
<% end %> <% end %>

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -x
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# 'target' is the output directory # 'target' is the output directory

View File

@ -1,8 +1,8 @@
# Resque tasks # Resque tasks
require 'resque/tasks' require 'resque/tasks'
require 'resque_scheduler/tasks' require 'resque/scheduler/tasks'
require 'resque' require 'resque'
require 'resque_scheduler' require 'resque-scheduler'
task :scheduler => :environment do task :scheduler => :environment do