Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Upgrade to rails 4.1

Browse source
This commit is contained in:
wvengen 2014-11-21 14:37:56 +01:00
parent 6188567931
commit 6e990fed4c
23 changed files with 179 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -47,7 +47,6 @@ class User < ActiveRecord::Base
end
after_save do
return if settings_attributes.nil?
settings_attributes.each do |key, value|
value.each do |k, v|
case v
@ -58,7 +57,7 @@ class User < ActiveRecord::Base
end
end
self.settings.merge!(key, value)
end
end if settings_attributes
end
# sorted by display name