SHIMADA Koji
null+****@clear*****
Thu Aug 23 10:45:57 JST 2012
SHIMADA Koji 2012-08-23 10:45:57 +0900 (Thu, 23 Aug 2012) New Revision: add24c52f456809f0df96d3fdf4e08c050f813f7 https://github.com/logaling/logaling-server/commit/add24c52f456809f0df96d3fdf4e08c050f813f7 Merged 111235b: Merge branch 'add-user-authentication' into merge-add-user-authentication Log: Add omniauth to dependency gems Modified files: Gemfile Gemfile.lock Modified: Gemfile (+2 -0) =================================================================== --- Gemfile 2012-08-23 09:51:44 +0900 (8cb570e) +++ Gemfile 2012-08-23 10:45:57 +0900 (0fc7a44) @@ -24,6 +24,8 @@ end gem 'jquery-rails' gem 'haml-rails' +gem 'omniauth' + # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' Modified: Gemfile.lock (+5 -0) =================================================================== --- Gemfile.lock 2012-08-23 09:51:44 +0900 (8b256d4) +++ Gemfile.lock 2012-08-23 10:45:57 +0900 (d320301) @@ -86,6 +86,7 @@ GEM activesupport (~> 3.0) haml (~> 3.0) railties (~> 3.0) + hashie (1.2.0) hike (1.2.1) i18n (0.6.0) i18n_generators (1.1.0) @@ -118,6 +119,9 @@ GEM net-http-digest_auth (1.1.1) net-http-persistent (1.9) nokogiri (1.5.5) + omniauth (1.1.0) + hashie (~> 1.2) + rack pkg-config (1.1.4) polyglot (0.3.3) rack (1.4.1) @@ -213,6 +217,7 @@ DEPENDENCIES i18n_generators jquery-rails logaling-command! + omniauth rails (= 3.2.8) rspec-rails sass-rails (~> 3.2.3) -------------- next part -------------- An HTML attachment was scrubbed...Télécharger
