Changeset [0e63276ba4a7eb63fba451bf7f05023b73666d72] by Shawn Balestracci
November 10th, 2012 @ 03:48 PM
Merge branch 'ruby_1.9.3' into rails3.1_ruby_1.9.3
Conflicts:
Gemfile.lock
app/controllers/student_searches_controller.rb
https://github.com/vegantech/sims/commit/0e63276ba4a7eb63fba451bf7f...
Committed by Shawn Balestracci
- A db/migrate/20121019184206_add_index_to_district.rb
- 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
- A features/step_definitions/district_settings_steps.rb
- M Gemfile
- M Gemfile.lock
- M app/controllers/application_controller.rb
- M app/controllers/districts_controller.rb
- M app/controllers/help_controller.rb
- M app/controllers/stats_controller.rb
- M app/controllers/student_searches_controller.rb
- M app/controllers/students_controller.rb
- M app/controllers/users/sessions_controller.rb
- M app/mailers/team_referrals.rb
- M app/models/district.rb
- M app/models/intervention_definition.rb
- M app/models/student.rb
- M app/models/team_consultation.rb
- M app/models/user.rb
- M app/views/district/users/_district_groups.html.erb
- M app/views/district/users/_role.html.erb
- M app/views/district/users/_roles.html.erb
- M app/views/districts/edit.html.erb
- M app/views/interventions/_detail.html.erb
- M app/views/login/_whats_new.html.erb
- M app/views/team_referrals/concern_note_created.text.erb
- M app/views/team_referrals/concern_note_withdrawn.text.erb
- M app/views/users/sessions/new.html.erb
- M db/schema.rb
- M features/district_admin/district_admin.feature
- M features/regular_user/alternate_entry_points.feature
- M features/regular_user/concern_note.feature
- M features/regular_user/custom_interventions.feature
- M features/step_definitions/checklist_steps.rb
- M lib/populate_intervention_dropdowns.rb
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/districts_controller_spec.rb
- M spec/controllers/student_searches_controller_spec.rb
- M spec/factories.rb
- M spec/lib/populate_intervention_dropdowns_spec.rb
- M spec/mailers/team_referrals_spec.rb
- M spec/models/district_spec.rb
- M spec/models/intervention_definition_spec.rb
- M spec/models/student_spec.rb
- M spec/models/user_spec.rb
- M spec/support/shared_contexts.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