Changeset [dc2126d7567f0fb0c6ccff6c1bcd5d242fecb9a5] by Shawn Balestracci
Revision dc2126d7567f0fb0c6ccff6c1bcd5d242fecb9a5,
committed by Shawn Balestracci
· March 27th, 2011 @ 01:40 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/dc2126d7567f0fb0c6ccff6c1b...
7 changed files
-
A
db/migrate/20110327175111_add_user_id_to_district_logs.rb -
M
app/controllers/login_controller.rb -
M
app/models/district_log.rb -
M
app/models/user.rb -
M
db/schema.rb -
M
spec/controllers/login_controller_spec.rb -
M
spec/models/user_spec.rb