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:
parent
4500b606ce
commit
14e445c600
|
@ -54,6 +54,4 @@ Rails::Initializer.run do |config|
|
|||
# Define your email configuration in email.yml instead.
|
||||
# It will automatically turn deliveries on
|
||||
config.action_mailer.perform_deliveries = false
|
||||
|
||||
config.gem 'ruby-openid', :lib => 'openid'
|
||||
end
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
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
|
||||
begin
|
||||
require 'openid'
|
||||
rescue LoadError
|
||||
begin
|
||||
gem 'ruby-openid', '>=2.0.4'
|
||||
gem 'ruby-openid', '>=2.1.4'
|
||||
rescue Gem::LoadError
|
||||
puts "Install the ruby-openid gem to enable OpenID support"
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue