SHIMADA Koji
null+****@clear*****
Wed Sep 19 11:54:57 JST 2012
SHIMADA Koji 2012-09-19 11:54:57 +0900 (Wed, 19 Sep 2012) New Revision: 2ee400835509f37ba2440dc8df50af86037ad302 https://github.com/logaling/logaling-server/commit/2ee400835509f37ba2440dc8df50af86037ad302 Merged d31ccac: Merge pull request #12 from logaling/add-twitter-to-oauth-provider Log: Add twitter to OAuth provider Modified files: .env.sample app/views/layouts/application.html.haml config/initializers/omniauth.rb Modified: .env.sample (+3 -0) =================================================================== --- .env.sample 2012-09-19 11:54:13 +0900 (233bb3f) +++ .env.sample 2012-09-19 11:54:57 +0900 (bf65acf) @@ -3,3 +3,6 @@ GITHUB_SECRET=your-github-secret FACEBOOK_KEY=your-facebook-key FACEBOOK_SECRET=your-facebook-secret + +TWITTER_KEY=your-twitter-key +TWITTER_SECRET=your-twitter-secret Modified: app/views/layouts/application.html.haml (+1 -1) =================================================================== --- app/views/layouts/application.html.haml 2012-09-19 11:54:13 +0900 (f45d143) +++ app/views/layouts/application.html.haml 2012-09-19 11:54:57 +0900 (1fc6415) @@ -31,7 +31,7 @@ - else - if Rails.env.development? %li= link_to "Sign in (for dev)", "/auth/developer" - - %w(github facebook).each do |provider| + - %w(github facebook twitter).each do |provider| %li= link_to "Sign in with #{provider.capitalize}", "/auth/#{provider}" .container Modified: config/initializers/omniauth.rb (+1 -0) =================================================================== --- config/initializers/omniauth.rb 2012-09-19 11:54:13 +0900 (992e685) +++ config/initializers/omniauth.rb 2012-09-19 11:54:57 +0900 (4645497) @@ -2,4 +2,5 @@ Rails.application.config.middleware.use OmniAuth::Builder do provider :developer unless Rails.env.production? provider :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET'] provider :facebook, ENV['FACEBOOK_KEY'], ENV['FACEBOOK_SECRET'] + provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET'] end -------------- next part -------------- An HTML attachment was scrubbed...Download