diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 12 | ||||
| -rw-r--r-- | config/crontab-example | 2 | ||||
| -rw-r--r-- | config/routes.rb | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/config/application.rb b/config/application.rb index 4513e4eb7..1cff3a125 100644 --- a/config/application.rb +++ b/config/application.rb @@ -93,16 +93,16 @@ module Alaveteli # Change the path that assets are served from # config.assets.prefix = "/assets" - # These additional precompiled Javascript files are actually - # manifests that require the real javascript files: + # These additional precompiled asset files are actually + # manifests that require the real asset files: config.assets.precompile += ['admin.js', 'profile-photos.js', - 'stats.js'] + 'stats.js', + 'fancybox.css', + 'fancybox.js'] # ... while these are individual files that can't easily be # grouped: - config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js', - 'jquery.fancybox-1.3.4.css', - 'jquery.Jcrop.css', + config.assets.precompile += ['jquery.Jcrop.css', 'excanvas.min.js', 'select-authorities.js', 'jquery_ujs.js', diff --git a/config/crontab-example b/config/crontab-example index 64d0c45c9..8fe13151b 100644 --- a/config/crontab-example +++ b/config/crontab-example @@ -12,7 +12,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org # Every 10 minutes 5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-alert-tracks check 5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-purge-varnish check -0,10,20,30,40,50 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-batch-requests.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/send-batch-requests || echo "stalled?" +0,10,20,30,40,50 * * * * !!(*= $user *)!! run-with-lockfile -n !!(*= $vhost_dir *)!!/send-batch-requests.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/send-batch-requests || echo "stalled?" # Once an hour 09 * * * * !!(*= $user *)!! run-with-lockfile -n !!(*= $vhost_dir *)!!/alert-comment-on-request.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/alert-comment-on-request || echo "stalled?" diff --git a/config/routes.rb b/config/routes.rb index 1079fbe14..d9d21f0bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -248,6 +248,14 @@ Alaveteli::Application.routes.draw do match '/admin/censor/destroy/:censor_rule_id' => 'admin_censor_rule#destroy', :as => :admin_rule_destroy #### + #### AdminSpamAddresses controller + scope '/admin' do + resources :spam_addresses, + :controller => 'admin_spam_addresses', + :only => [:index, :create, :destroy] + end + #### + #### Api controller match '/api/v2/request.json' => 'api#create_request', :as => :api_create_request, :via => :post |