Changeset [d06af19557707213d26919e27dc5da3e6fe66ae1] by Shawn Balestracci
Revision d06af19557707213d26919e27dc5da3e6fe66ae1,
committed by Shawn Balestracci
· August 17th, 2013 @ 03:13 PM
Merge branch 'rm_production' into production
Conflicts:
app/models/intervention_definition.rb
https://github.com/vegantech/sims/commit/d06af19557707213d26919e27d...
11 changed files
-
M
app/controllers/intervention_builder/recommended_monitors_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/models/intervention_definition.rb -
M
app/models/probe_definition.rb -
M
app/models/recommended_monitor.rb -
M
app/views/intervention_builder/interventions/show.html.erb -
M
app/views/interventions/probe_assignments/_assign_progress_monitor.html.erb -
M
lib/populate_intervention_dropdowns.rb -
M
spec/controllers/interventions_controller_spec.rb -
M
spec/lib/populate_intervention_dropdowns_spec.rb -
M
spec/models/intervention_definition_spec.rb