X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/79420631ceb2cb0f33e127b06e7b4f8a461b9281..152cb13a02dfcb2966b8a9b29382f84a99a23a69:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 2c9e4803c..2e5da44e3 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -45,7 +45,7 @@ Rails::Initializer.run do |config|
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem 'composite_primary_keys', :version => '1.0.10'
+  config.gem 'composite_primary_keys', :version => '1.1.0'
   config.gem 'libxml-ruby', :version => '>= 0.8.3', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'mysql'
@@ -60,7 +60,7 @@ Rails::Initializer.run do |config|
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
-  config.log_level = :debug
+  # config.log_level = :debug
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
@@ -91,5 +91,5 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
+  config.active_record.default_timezone = :utc
 end