Browse files

Merge branch 'master' of 10.10.20.10:/projects/temptd

Conflicts:
	app/models/user.rb
  • Loading branch information...
2 parents 36f24c9 + 769234a commit 6d202fa4d700ceb0826ec45b0a7dc60e1bf035fc Mike Simpson committed Dec 21, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −2 app/models/user.rb
  2. +3 −0 config/initializers/devise.rb
View
3 app/models/user.rb
@@ -6,8 +6,7 @@ class User < ActiveRecord::Base
# :token_authenticatable, :confirmable,
# :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
- :recoverable, :rememberable, :trackable, :validatable
-
+ :recoverable, :rememberable, :trackable, :validatable, :omniauthable
# Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :nickname, :provider, :uid
end
View
3 config/initializers/devise.rb
@@ -14,6 +14,9 @@
# :mongoid (bson_ext recommended) by default. Other ORMs may be
# available as additional gems.
require 'devise/orm/active_record'
+
+ require "omniauth-github"
+ config.omniauth :facebook, "APP_ID", "APP_SECRET"
# ==> Configuration for any authentication mechanism
# Configure which keys are used when authenticating a user. The default is

0 comments on commit 6d202fa

Please sign in to comment.