Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Upgrade to rails 3.2.14.

Browse source
This commit is contained in:
Martin Edenhofer 2013-08-03 21:17:20 +02:00
parent 41c38e1bc2
commit 449158b943
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.13' gem 'rails', '3.2.14'
# preparation for rails 4 # preparation for rails 4
#gem 'rails', '4.0.0.rc1' #gem 'rails', '4.0.0.rc1'

2
app/controllers/application_controller.rb
View file

@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base
def current_user def current_user
return @_current_user if @_current_user return @_current_user if @_current_user
return if !session[:user_id] return if !session[:user_id]
@_current_user = User.find_by_id( session[:user_id] ) @_current_user = User.find( session[:user_id] )
end end
def current_user_set(user) def current_user_set(user)
@_current_user = user @_current_user = user