diff --git a/Gemfile b/Gemfile index 1a1fb4b..349a633 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'memcache-client' gem 'omniauth', '0.2.0.beta3' gem "oa-openid", '0.2.0.beta3' # gem "omniauth_china", :path => "/Users/jason/work/omniauth_china" -gem "omniauth_china", :git => "git://github.com/huacnlee/omniauth_china.git" +gem "omniauth_china", "0.0.6" # 后台列表 # gem 'wice_grid', '3.0.0.pre1' diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5607ed1..9cf940f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,7 +1,7 @@ # coding: utf-8 class UsersController < ApplicationController skip_before_filter :verify_authenticity_token, :only => [:auth_callback] - before_filter :init_user + before_filter :init_user, :except => [:auth_callback] def init_user @user = User.find_by_slug(params[:id])