diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
| commit | 23816aff9e970e1264b2231757702f648f05e30c (patch) | |
| tree | a286daaa01c1ca2bb5f8ca7035d3370541148f43 /app/helpers/config_helper.rb | |
| parent | 8c5a6f4dc2d174ed5190719d952b39720d3bf362 (diff) | |
| parent | 5097146ff016b2aaa9d3dc29f3ec65db0aadbb72 (diff) | |
Merge branch 'develop' into feature/follow-buttons
Conflicts:
app/models/track_mailer.rb
app/models/track_thing.rb
Diffstat (limited to 'app/helpers/config_helper.rb')
| -rw-r--r-- | app/helpers/config_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb index b0381a2f5..543b60256 100644 --- a/app/helpers/config_helper.rb +++ b/app/helpers/config_helper.rb @@ -2,7 +2,7 @@ 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) end |