| @@ 86-90 (lines=5) @@ | ||
| 83 | session[:invite_token] = params[:invite_token] |
|
| 84 | end |
|
| 85 | ||
| 86 | unless params[:old_twitter_user_id].nil? && session[:old_twitter_user_id].nil? |
|
| 87 | logout |
|
| 88 | flash.now[:alert] = I18n.t("registration.deprecated.new_signin") |
|
| 89 | session[:old_twitter_user_id] = params[:old_twitter_user_id] unless params[:old_twitter_user_id].nil? |
|
| 90 | end |
|
| 91 | ||
| 92 | @user = User.new |
|
| 93 | end |
|
| @@ 65-68 (lines=4) @@ | ||
| 62 | ||
| 63 | # GET /signin |
|
| 64 | def signin |
|
| 65 | unless params[:old_twitter_user_id].nil? && session[:old_twitter_user_id].nil? |
|
| 66 | flash[:alert] = I18n.t("registration.deprecated.new_signin") |
|
| 67 | session[:old_twitter_user_id] = params[:old_twitter_user_id] unless params[:old_twitter_user_id].nil? |
|
| 68 | end |
|
| 69 | end |
|
| 70 | ||
| 71 | # GET /ldap_signin |
|