kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the bundled ruby-openid gem 

* The open_id_authentication plugin will require the gem automatically so
  it doesn't need to be added to environment.rb
* Changed the version requirement on the open_id_authentication to match
  the latest stable version.  Rails config.gem looks for a directory named
  after that specific version and will not load newer versions.

  #699

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2452 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2009-02-12 01:32:50 +00:00
parent 4500b606ce
commit 14e445c600
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environment.rb
View File

@ -54,6 +54,4 @@ Rails::Initializer.run do |config|
# Define your email configuration in email.yml instead. # Define your email configuration in email.yml instead.
# It will automatically turn deliveries on # It will automatically turn deliveries on
config.action_mailer.perform_deliveries = false config.action_mailer.perform_deliveries = false
config.gem 'ruby-openid', :lib => 'openid'
end end

4
vendor/plugins/open_id_authentication/init.rb vendored
View File

@ -1,11 +1,11 @@
if config.respond_to?(:gems) if config.respond_to?(:gems)
config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4' config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.1.4'
else else
begin begin
require 'openid' require 'openid'
rescue LoadError rescue LoadError
begin begin
gem 'ruby-openid', '>=2.0.4' gem 'ruby-openid', '>=2.1.4'
rescue Gem::LoadError rescue Gem::LoadError
puts "Install the ruby-openid gem to enable OpenID support" puts "Install the ruby-openid gem to enable OpenID support"
end end