Changeset [b9f66a108754e8a4f67429bc7e0bb352705e9f82] by Shawn Balestracci
October 22nd, 2012 @ 07:06 PM
Merge branch 'ruby_1.9.3' into wip
Conflicts:
db/schema.rb
https://github.com/vegantech/sims/commit/b9f66a108754e8a4f67429bc7e...
Committed by Shawn Balestracci
- A db/migrate/20121023015949_custom_intervention_should_not_be_null.rb
- A features/regular_user/custom_intervention_settings.feature
- A features/step_definitions/custom_intervention_settings.rb
- M app/controllers/students_controller.rb
- M app/models/intervention_definition.rb
- M app/models/user.rb
- M app/views/districts/edit.html.erb
- M app/views/login/_whats_new.html.erb
- M db/schema.rb
- M features/regular_user/custom_interventions.feature
- M lib/populate_intervention_dropdowns.rb
- M spec/lib/populate_intervention_dropdowns_spec.rb
- M spec/mailers/team_referrals_spec.rb
- M spec/models/intervention_definition_spec.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Student Intervention Monitoring System