aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/config_helper.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-01 11:03:52 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-01 11:03:52 +0100
commitbe96333dafd0fa0623ca4495237c8c6fa5457c14 (patch)
tree6a0dbc34767db4a49ea9231738fe17dd1df6934a /app/helpers/config_helper.rb
parent3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (diff)
parent6ee1e8d0a4a8cfe02797c1a853bf27af2610ad27 (diff)
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
Conflicts: config/general.yml-example
Diffstat (limited to 'app/helpers/config_helper.rb')
-rw-r--r--app/helpers/config_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb
index 543b60256..73e12172f 100644
--- a/app/helpers/config_helper.rb
+++ b/app/helpers/config_helper.rb
@@ -1,9 +1,5 @@
module ConfigHelper
def site_name
- MySociety::Config.get('SITE_NAME', 'Alaveteli')
- end
-
- def force_registration_on_new_request
- MySociety::Config.get('FORCE_REGISTRATION_ON_NEW_REQUEST', false)
+ Configuration::site_name
end
end \ No newline at end of file