diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 11 | ||||
| -rw-r--r-- | config/general.yml-example | 13 | ||||
| -rw-r--r-- | config/routes.rb | 6 | ||||
| -rw-r--r-- | config/test.yml | 9 |
4 files changed, 3 insertions, 36 deletions
diff --git a/config/environment.rb b/config/environment.rb index 7ffbe8701..268a44e65 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -117,17 +117,6 @@ end # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = Configuration::domain -# So that javascript assets use full URL, so proxied admin URLs read javascript OK -if (Configuration::domain != "") - ActionController::Base.asset_host = Proc.new { |source, request| - if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//) - Configuration::admin_public_url - else - Configuration::domain - end - } -end - # fallback locale and available locales available_locales = Configuration::available_locales.split(/ /) default_locale = Configuration::default_locale diff --git a/config/general.yml-example b/config/general.yml-example index 406fe69fa..6bf54f400 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -99,19 +99,6 @@ TRACK_SENDER_NAME: 'Alaveteli Webmaster' # this up! RAW_EMAILS_LOCATION: 'files/raw_emails' -# The base URL for admin pages, must always end with a '/' -# e.g. https://www.example.com/secure/alaveteli-admin/ -# If not specified, it will default to the path to the admin controller, -# which is usually what you want. It is useful in situations where admin -# requests are proxied via a secure server, for example. -ADMIN_BASE_URL: '' - -# Where /stylesheets sits under for admin pages. See asset_host in -# config/environment.rb. Can be full domain or relative path (not an -# absolute path beginning with /). Again, unlikely to want to change -# this. -ADMIN_PUBLIC_URL: '' - # Secret key for signing cookie_store sessions COOKIE_STORE_SESSION_SECRET: 'your secret key here, make it long and random' diff --git a/config/routes.rb b/config/routes.rb index c0e79f2cd..e95405c1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -161,9 +161,9 @@ ActionController::Routing::Routes.draw do |map| end map.with_options :controller => 'request_game' do |game| - game.play '/categorise/play', :action => 'play' - game.request '/categorise/request/:url_title', :action => 'show' - game.stop '/categorise/stop', :action => 'stop' + game.categorise_play '/categorise/play', :action => 'play' + game.categorise_request '/categorise/request/:url_title', :action => 'show' + game.categorise_stop '/categorise/stop', :action => 'stop' end map.with_options :controller => 'admin_public_body' do |body| diff --git a/config/test.yml b/config/test.yml index ef270dcf2..f40b11764 100644 --- a/config/test.yml +++ b/config/test.yml @@ -71,15 +71,6 @@ CONTACT_NAME: 'Alaveteli Webmaster' # this up! RAW_EMAILS_LOCATION: 'files/raw_emails' -# The base URL for admin pages. You probably don't want to change this. -ADMIN_BASE_URL: '' - -# Where /stylesheets sits under for admin pages. See asset_host in -# config/environment.rb. Can be full domain or relative path (not an -# absolute path beginning with /). Again, unlikely to want to change -# this. -ADMIN_PUBLIC_URL: '' - # Secret key for signing cookie_store sessions COOKIE_STORE_SESSION_SECRET: 'your secret key here, make it long and random' |