gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some houndci fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-06-18 18:05:28 +03:00
parent de58ddde50
commit 0beed70d7f
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -25,7 +25,6 @@ class User < ActiveRecord::Base
# ====Returns # ====Returns
# * +User::ActiveRecord_Relation+ -> user # * +User::ActiveRecord_Relation+ -> user
def self.find_for_auth(auth, current_user = nil) def self.find_for_auth(auth, current_user = nil)
user = current_user user = current_user
if user.nil? # No current user available, user is not already logged in if user.nil? # No current user available, user is not already logged in

4
config/routes.rb
View file

@ -2,9 +2,9 @@ Osem::Application.routes.draw do
get 'conference/show' get 'conference/show'
devise_for :users, :controllers => { registrations: :registrations, devise_for :users, controllers: { registrations: :registrations,
omniauth_callbacks: 'users/omniauth_callbacks' }, omniauth_callbacks: 'users/omniauth_callbacks' },
:path => 'accounts' path: 'accounts'
namespace :admin do namespace :admin do
resources :users resources :users