Changeset [11cf2433f43a8dc456fb7c79a256088f464ec0e3] by Shawn Balestracci
Revision 11cf2433f43a8dc456fb7c79a256088f464ec0e3,
committed by Shawn Balestracci
· February 18th, 2012 @ 06:40 PM
Merge branch 'upgrade_to_rails_3_0' into wip_3_0
Conflicts:
app/controllers/intervention_builder/interventions_controller.rb
app/models/right.rb
config/routes.rb
https://github.com/vegantech/sims/commit/11cf2433f43a8dc456fb7c79a2...
184 changed files
-
A
app/mailers/notifications.rb -
A
app/mailers/team_referrals.rb -
A
app/views/interventions/categories/create.js.rjs -
A
app/views/interventions/definitions/create.js.rjs -
A
app/views/interventions/goals/create.js.rjs -
A
app/views/interventions/objectives/create.js.rjs -
A
config/initializers/use_subdomains.rb -
A
spec/mailers/notifications_spec.rb -
A
spec/mailers/team_referrals_spec.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/.gitignore -
A
vendor/plugins_broken_in_rails_3/will_paginate/.manifest -
A
vendor/plugins_broken_in_rails_3/will_paginate/CHANGELOG.rdoc -
A
vendor/plugins_broken_in_rails_3/will_paginate/LICENSE -
A
vendor/plugins_broken_in_rails_3/will_paginate/README.rdoc -
A
vendor/plugins_broken_in_rails_3/will_paginate/Rakefile -
A
vendor/plugins_broken_in_rails_3/will_paginate/examples/apple-circle.gif -
A
vendor/plugins_broken_in_rails_3/will_paginate/examples/index.haml -
A
vendor/plugins_broken_in_rails_3/will_paginate/examples/index.html -
A
vendor/plugins_broken_in_rails_3/will_paginate/examples/pagination.css -
A
vendor/plugins_broken_in_rails_3/will_paginate/examples/pagination.sass -
A
vendor/plugins_broken_in_rails_3/will_paginate/init.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/array.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/collection.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/core_ext.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/finder.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/named_scope.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/named_scope_patch.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/version.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/lib/will_paginate/view_helpers.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/boot.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/collection_test.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/console -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/database.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/finder_test.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/admin.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/developer.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/developers_projects.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/project.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/projects.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/replies.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/reply.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/schema.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/topic.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/topics.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/user.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/fixtures/users.yml -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/helper.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/lib/activerecord_test_case.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/lib/activerecord_test_connector.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/lib/load_fixtures.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/lib/view_test_process.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/tasks.rake -
A
vendor/plugins_broken_in_rails_3/will_paginate/test/view_test.rb -
A
vendor/plugins_broken_in_rails_3/will_paginate/will_paginate.gemspec -
R
app/models/notifications.rb -
R
app/models/team_referrals.rb -
R
app/views/interventions/categories/select.js.rjs -
R
app/views/interventions/definitions/select.js.rjs -
R
app/views/interventions/goals/select.js.rjs -
R
app/views/interventions/objectives/select.js.rjs -
R
config/routes.rails3 -
R
config/routes.rb.rails2 -
R
config/routes.rb.rails3.blank -
R
lib/controller_rights.rb -
R
spec/lib/controller_rights_spec.rb -
R
spec/models/notifications_spec.rb -
R
spec/models/team_referrals_spec.rb -
R
vendor/plugins/will_paginate/.gitignore -
R
vendor/plugins/will_paginate/.manifest -
R
vendor/plugins/will_paginate/CHANGELOG.rdoc -
R
vendor/plugins/will_paginate/LICENSE -
R
vendor/plugins/will_paginate/README.rdoc -
R
vendor/plugins/will_paginate/Rakefile -
R
vendor/plugins/will_paginate/examples/apple-circle.gif -
R
vendor/plugins/will_paginate/examples/index.haml -
R
vendor/plugins/will_paginate/examples/index.html -
R
vendor/plugins/will_paginate/examples/pagination.css -
R
vendor/plugins/will_paginate/examples/pagination.sass -
R
vendor/plugins/will_paginate/init.rb -
R
vendor/plugins/will_paginate/lib/will_paginate.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/array.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/collection.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/finder.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/version.rb -
R
vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb -
R
vendor/plugins/will_paginate/test/boot.rb -
R
vendor/plugins/will_paginate/test/collection_test.rb -
R
vendor/plugins/will_paginate/test/console -
R
vendor/plugins/will_paginate/test/database.yml -
R
vendor/plugins/will_paginate/test/finder_test.rb -
R
vendor/plugins/will_paginate/test/fixtures/admin.rb -
R
vendor/plugins/will_paginate/test/fixtures/developer.rb -
R
vendor/plugins/will_paginate/test/fixtures/developers_projects.yml -
R
vendor/plugins/will_paginate/test/fixtures/project.rb -
R
vendor/plugins/will_paginate/test/fixtures/projects.yml -
R
vendor/plugins/will_paginate/test/fixtures/replies.yml -
R
vendor/plugins/will_paginate/test/fixtures/reply.rb -
R
vendor/plugins/will_paginate/test/fixtures/schema.rb -
R
vendor/plugins/will_paginate/test/fixtures/topic.rb -
R
vendor/plugins/will_paginate/test/fixtures/topics.yml -
R
vendor/plugins/will_paginate/test/fixtures/user.rb -
R
vendor/plugins/will_paginate/test/fixtures/users.yml -
R
vendor/plugins/will_paginate/test/helper.rb -
R
vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb -
R
vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb -
R
vendor/plugins/will_paginate/test/lib/load_fixtures.rb -
R
vendor/plugins/will_paginate/test/lib/view_test_process.rb -
R
vendor/plugins/will_paginate/test/tasks.rake -
R
vendor/plugins/will_paginate/test/view_test.rb -
R
vendor/plugins/will_paginate/will_paginate.gemspec -
M
Gemfile -
M
Gemfile.lock -
M
app/cells/administration_cell.rb -
M
app/cells/news_cell.rb -
M
app/controllers/application_controller.rb -
M
app/controllers/checklist_builder/checklists_controller.rb -
M
app/controllers/custom_flags_controller.rb -
M
app/controllers/district/students_controller.rb -
M
app/controllers/districts_controller.rb -
M
app/controllers/grouped_progress_entries_controller.rb -
M
app/controllers/groups_controller.rb -
M
app/controllers/intervention_builder/goals_controller.rb -
M
app/controllers/intervention_builder/interventions_controller.rb -
M
app/controllers/intervention_builder/probes_controller.rb -
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/probe_assignments_controller.rb -
M
app/controllers/interventions/probes_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/controllers/login_controller.rb -
M
app/controllers/main_controller.rb -
M
app/controllers/principal_overrides_controller.rb -
M
app/controllers/reports_controller.rb -
M
app/controllers/scripted_controller.rb -
M
app/controllers/students_controller.rb -
M
app/controllers/team_consultations_controller.rb -
M
app/controllers/unattached_interventions_controller.rb -
M
app/helpers/application_helper.rb -
M
app/helpers/students_helper.rb -
M
app/models/consultation_form_request.rb -
M
app/models/grouped_progress_entry.rb -
M
app/models/intervention.rb -
M
app/models/intervention_participant.rb -
M
app/models/principal_override_observer.rb -
M
app/models/probe_graph.rb -
M
app/models/recommendation_observer.rb -
M
app/models/right.rb -
M
app/models/role.rb -
M
app/models/team_consultation.rb -
M
app/models/user.rb -
M
app/views/district/students/_form.html.erb -
M
app/views/intervention_builder/interventions/index.html.erb -
M
app/views/interventions/categories/_select.html.erb -
M
app/views/interventions/definitions/_select.html.erb -
M
app/views/interventions/goals/_select.html.erb -
M
app/views/interventions/objectives/_select.html.erb -
M
app/views/layouts/_menu.html.erb -
M
app/views/login/_login.html.erb -
M
app/views/principal_overrides/create.js.rjs -
M
app/views/tiers/_tier.html.erb -
M
config/initializers/host_info.rb -
M
config/initializers/mail.rb -
M
config/routes.rb -
M
lib/tasks/rcov_rake_helper.rb -
M
lib/tasks/verify_rcov.rb -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/interventions/categories_controller_spec.rb -
M
spec/controllers/interventions/definitions_controller_spec.rb -
M
spec/controllers/interventions/goals_controller_spec.rb -
M
spec/controllers/interventions/objectives_controller_spec.rb -
M
spec/controllers/login_controller_spec.rb -
M
spec/controllers/scripted_controller_spec.rb -
M
spec/helpers/application_helper_spec.rb -
M
spec/models/right_spec.rb -
M
spec/models/user_spec.rb -
M
spec/support/shared_contexts.rb -
M
vendor/plugins/coveralls/lib/coveralls.rb