Merge branch 'master' into openid

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index cf9aa1aae96fb7d3b1c29b6da0f7406d0fcd5777..7ee9e79af53732ba61efb95ab7003e1d000a31b5 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -56,7 +56,6 @@ Rails::Initializer.run do |config|
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
-  config.gem 'ruby-openid', :version => '>= 2.0.4', :lib => 'openid'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
 
@@ -89,12 +88,6 @@ Rails::Initializer.run do |config|
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 
-  # We will use the old style of migrations, rather than the newer
-  # timestamped migrations that were introduced with Rails 2.1, as
-  # it will be confusing to have the numbered and timestamped migrations
-  # together in the same folder.
-  config.active_record.timestamped_migrations = false
-
   # 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