Changeset [6a98a4b67a9080b76622a97f99db6a3a2894921d] by Shawn Balestracci
Revision 6a98a4b67a9080b76622a97f99db6a3a2894921d,
committed by Shawn Balestracci
· February 11th, 2014 @ 12:45 PM
Merge branch 'rm_production' into wip-open
Conflicts:
app/controllers/intervention_builder/categories_controller.rb
app/controllers/intervention_builder/interventions_controller.rb
app/controllers/intervention_builder/objectives_controller.rb
app/controllers/intervention_builder/probes_controller.rb
https://github.com/vegantech/sims/commit/6a98a4b67a9080b76622a97f99...
13 changed files
-
A
app/controllers/intervention_builder/base_controller.rb -
A
config/initializers/no_deprecations.rb -
M
app/controllers/intervention_builder/categories_controller.rb -
M
app/controllers/intervention_builder/goals_controller.rb -
M
app/controllers/intervention_builder/interventions_controller.rb -
M
app/controllers/intervention_builder/objectives_controller.rb -
M
app/controllers/intervention_builder/probes_controller.rb -
M
app/controllers/intervention_builder/recommended_monitors_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/right.rb -
M
app/views/layouts/_menu.html.erb -
M
config/routes.rb -
M
spec/controllers/intervention_builder/recommended_monitors_controller_spec.rb