diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-07-12 11:49:58 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-07-12 11:49:58 +0100 |
| commit | b514aecf08384f3839db5cdb2274d3748a4402a2 (patch) | |
| tree | 5354df8cce23f043bc4cbfac0cdcfc24989550a4 /app/controllers/application_controller.rb | |
| parent | 0d630ab2c87d925d27879c1cc0db55b0286e46d6 (diff) | |
| parent | d5ae493074fa3b71ba517ce34525402f5e59eff0 (diff) | |
merge IZ/Kosovo fork and refactor
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e39865dd9..405327952 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,9 +29,8 @@ class ApplicationController < ActionController::Base helper_method :site_name, :locale_from_params def site_name - # XXX should come from database: - site_name = "WhatDoTheyKnow" - return site_name + site_name = MySociety::Config.get('SITE_NAME', 'Alaveteli') + return site_name end # Help work out which request causes RAM spike. |