Permalink
Browse files

Merging...

  • Loading branch information...
Michael Bleigh
Michael Bleigh committed Feb 4, 2011
2 parents 129cba8 + 8dbdb01 commit 3a2dea5eec0f2cd4e86e6a335d2d616ba4d530a8
Showing with 1 addition and 2 deletions.
  1. +1 −1 oa-enterprise/lib/omniauth/strategies/cas.rb
  2. +0 −1 oa-more/lib/omniauth/more.rb
@@ -9,7 +9,7 @@ class CAS
autoload :ServiceTicketValidator, 'omniauth/strategies/cas/service_ticket_validator'
def initialize(app, options = {}, &block)
- super(app, options.delete(:name) || :cas, options, &block)
+ super(app, options[:name] || :cas, options.dup, &block)
@configuration = OmniAuth::Strategies::CAS::Configuration.new(options)
end
@@ -3,7 +3,6 @@
module OmniAuth
module Strategies
autoload :WindowsLive, 'omniauth/strategies/windows_live'
- # autoload strategies here
autoload :Flickr, 'omniauth/strategies/flickr'
end
end

0 comments on commit 3a2dea5

Please sign in to comment.