1
0
Fork 0
mirror of https://github.com/omniauth/omniauth.git synced 2022-11-09 12:31:49 -05:00

Merging...

This commit is contained in:
Michael Bleigh 2011-02-03 23:12:16 -06:00
commit 3a2dea5eec
2 changed files with 1 additions and 2 deletions

View file

@ -9,7 +9,7 @@ module OmniAuth
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

View file

@ -3,7 +3,6 @@ require 'omniauth/core'
module OmniAuth
module Strategies
autoload :WindowsLive, 'omniauth/strategies/windows_live'
# autoload strategies here
autoload :Flickr, 'omniauth/strategies/flickr'
end
end