summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-14 14:45:15 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-18 21:51:53 +0100
commit527d223680864a40887674768cf83a4a8626ead9 (patch)
tree0936522cb7f36dd8ba3624296af64f2c4003f7a8 /config/environments
parent51f48392abb225eaed58a6368382cdc28a961d3b (diff)
downloadgitlab-ce-527d223680864a40887674768cf83a4a8626ead9.tar.gz
Update Rails config
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/development.rb20
-rw-r--r--config/environments/production.rb11
-rw-r--r--config/environments/test.rb12
3 files changed, 22 insertions, 21 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 38400d17c8b..6cba17f6ea2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -2,7 +2,7 @@ Gitlab::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # every request. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
@@ -22,19 +22,21 @@ Gitlab::Application.configure do
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
+ # Raise exception on mass assignment protection for Active Record models
+ config.active_record.mass_assignment_sanitizer = :strict
+
+ # Log the query plan for queries taking more than this (works
+ # with SQLite, MySQL, and PostgreSQL)
+ config.active_record.auto_explain_threshold_in_seconds = 0.5
+
# Do not compress assets
config.assets.compress = false
# Expands the lines which load the assets
config.assets.debug = true
- config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+ # For having correct urls in mails
+ config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+ # Open sent mails in browser
config.action_mailer.delivery_method = :letter_opener
-
- # Raise exception on mass assignment protection for Active Record models
- config.active_record.mass_assignment_sanitizer = :strict
-
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index fc8d4c1135c..52fb8877cf3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -20,7 +20,7 @@ Gitlab::Application.configure do
# Generate digests for assets URLs
config.assets.digest = true
- # Defaults to Rails.root.join("public/assets")
+ # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files
@@ -33,8 +33,11 @@ Gitlab::Application.configure do
# See everything in the log (default is :info)
# config.log_level = :debug
+ # Prepend all log lines with the following tags
+ # config.log_tags = [ :subdomain, :uuid ]
+
# Use a different logger for distributed setups
- # config.logger = SyslogLogger.new
+ # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Use a different cache store in production
config.cache_store = :memory_store
@@ -58,6 +61,10 @@ Gitlab::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+ # Log the query plan for queries taking more than this (works
+ # with SQLite, MySQL, and PostgreSQL)
+ # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
config.action_mailer.delivery_method = :sendmail
# Defaults to:
# # config.action_mailer.sendmail_settings = {
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f5816e42b7f..b626986299b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -2,9 +2,9 @@ Gitlab::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
- # test suite. You never need to work with it otherwise. Remember that
+ # test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
- # and recreated between test runs. Don't rely on the data there!
+ # and recreated between test runs. Don't rely on the data there!
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
@@ -29,17 +29,9 @@ Gitlab::Application.configure do
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
- # 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,
- # like if you have constraints or database-specific column types
- # config.active_record.schema_format = :sql
-
# Raise exception on mass assignment protection for Active Record models
# config.active_record.mass_assignment_sanitizer = :strict
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
-
- # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
- config.assets.allow_debugging = true
end