From: Kai Krueger Date: Sat, 23 Jan 2010 15:31:01 +0000 (+0000) Subject: merge 19364:19600 of rails_port into the openID branch X-Git-Tag: live~6343 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/84db1d66b7d819a4a777d2b9e5909cffe82c514e merge 19364:19600 of rails_port into the openID branch renamed migration 049_add_open_id_authentication_tables.rb to 050_add_open_id_authentication_tables.rb --- 84db1d66b7d819a4a777d2b9e5909cffe82c514e diff --cc app/controllers/user_controller.rb index 3a4b00920,ca0046762..f9bbd5dd5 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@@ -15,7 -15,9 +15,9 @@@ class UserController < ApplicationContr before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete] filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation - + + cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete] + def save @title = t 'user.new.title' diff --cc config/environment.rb index da71cc572,ba5241a21..70a1ddbd5 --- a/config/environment.rb +++ b/config/environment.rb @@@ -52,9 -52,9 +52,10 @@@ Rails::Initializer.run do |config config.gem 'rmagick', :lib => 'RMagick' config.gem 'oauth', :version => '>= 0.3.6' config.gem 'httpclient' + config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4' + config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer' - # Only load the plugins named here, in the order given. By default, all plugins + # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] diff --cc db/migrate/050_add_open_id_authentication_tables.rb index 7dfff209d,000000000..7dfff209d mode 100644,000000..100644 --- a/db/migrate/050_add_open_id_authentication_tables.rb +++ b/db/migrate/050_add_open_id_authentication_tables.rb