aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/environment.rb19
1 files changed, 11 insertions, 8 deletions
diff --git a/config/environment.rb b/config/environment.rb
index b958c6475..957a66c0c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
# Be sure to restart your web server when you modify this file.
-# Uncomment below to force Rails into production mode when
+# Uncomment below to force Rails into production mode when
# you don't control web/app server and can't set it the proper way
# ENV['RAILS_ENV'] ||= 'production'
@@ -31,9 +31,12 @@ load "util.rb"
require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch')
+# Application version
+ALAVETELI_VERSION = '0.6.4'
+
Rails::Initializer.run do |config|
# Load intial mySociety config
- if ENV["RAILS_ENV"] == "test"
+ if ENV["RAILS_ENV"] == "test"
MySociety::Config.set_file(File.join(config.root_path, 'config', 'test'), true)
else
MySociety::Config.set_file(File.join(config.root_path, 'config', 'general'), true)
@@ -41,7 +44,7 @@ Rails::Initializer.run do |config|
MySociety::Config.load_default
# Settings in config/environments/* take precedence over those specified here
-
+
# Skip frameworks you're not going to use (only works if using vendor/rails)
# config.frameworks -= [ :action_web_service, :action_mailer ]
@@ -51,7 +54,7 @@ Rails::Initializer.run do |config|
# Add additional load paths for your own custom dirs
# config.load_paths += %W( #{Rails.root}/extras )
- # Force all environments to use the same logger level
+ # Force all environments to use the same logger level
# (by default production uses :info, the others :debug)
# TEMP: uncomment this to turn on logging in production environments
# config.log_level = :debug
@@ -60,7 +63,7 @@ Rails::Initializer.run do |config|
#GettextI18nRails.translations_are_html_safe = true
# Use SQL instead of Active Record's schema dumper when creating the test database.
- # This is necessary if your schema can't be completely dumped by the schema dumper,
+ # This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
config.active_record.schema_format = :sql
@@ -69,8 +72,8 @@ Rails::Initializer.run do |config|
# Make Active Record use UTC-base instead of local time
config.active_record.default_timezone = :utc
-
- config.after_initialize do
+
+ config.after_initialize do
require 'routing_filters.rb'
end
@@ -79,7 +82,7 @@ Rails::Initializer.run do |config|
ENV['RECAPTCHA_PRIVATE_KEY'] = MySociety::Config::get("RECAPTCHA_PRIVATE_KEY", 'x');
end
-# Add new inflection rules using the following format
+# Add new inflection rules using the following format
# (all these examples are active by default):
# Inflector.inflections do |inflect|
# inflect.plural /^(ox)$/i, '\1en'