Changeset [1424db56194a8541d9b70642b05dc4cbfe3c3efe] by Shawn Balestracci

Revision 1424db56194a8541d9b70642b05dc4cbfe3c3efe, committed by Shawn Balestracci · February 12th, 2012 @ 10:04 PM

Merge branch 'upgrade_to_rails_3_0' into wip_3_0

Conflicts:

app/views/interventions/categories/_select.html.erb

https://github.com/vegantech/sims/commit/1424db56194a8541d9b70642b0...

42 changed files

A vendor/plugins_broken_in_rails_3/acts_as_list/README
A vendor/plugins_broken_in_rails_3/acts_as_list/init.rb
A vendor/plugins_broken_in_rails_3/acts_as_list/lib/active_record/acts/list.rb
A vendor/plugins_broken_in_rails_3/acts_as_list/test/list_test.rb
R vendor/plugins/acts_as_list/README
R vendor/plugins/acts_as_list/init.rb
R vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
R vendor/plugins/acts_as_list/test/list_test.rb
M Gemfile
M Gemfile.lock
M app/controllers/intervention_builder/recommended_monitors_controller.rb
M app/controllers/interventions/categories_controller.rb
M app/controllers/interventions/definitions_controller.rb
M app/controllers/interventions/goals_controller.rb
M app/controllers/interventions/objectives_controller.rb
M app/controllers/interventions/probes_controller.rb
M app/controllers/interventions_controller.rb
M app/helpers/checklists_helper.rb
M app/helpers/interventions_helper.rb
M app/helpers/reports_helper.rb
M app/models/recommendation.rb
M app/views/interventions/_custom.html.erb
M app/views/interventions/_edit_view.html.erb
M app/views/interventions/_form.html.erb
M app/views/interventions/_intervention.html.erb
M app/views/interventions/categories/_select.html.erb
M app/views/interventions/categories/select.js.rjs
M app/views/interventions/definitions/_select.html.erb
M app/views/interventions/goals/_select.html.erb
M app/views/interventions/new.html.erb
M app/views/interventions/objectives/_select.html.erb
M app/views/interventions/probe_assignments/_assign_progress_monitor.html.erb
M app/views/interventions/probe_assignments/_intervention_probe_assignment_detail.html.erb
M app/views/recommendations/_form.html.erb
M app/views/reports/_select_format.html.erb
M app/views/reports/student_flag_summary.html.erb
M app/views/reports/student_overall.html.erb
M lib/populate_intervention_dropdowns.rb
M spec/controllers/interventions_controller_spec.rb
M spec/controllers/reports_controller_spec.rb
M spec/helpers/checklists_helper_spec.rb
M spec/lib/populate_intervention_dropdowns_spec.rb