Changeset [537ffdea50dff6bbe96d2aa5b37ca24b8d7c6617] by Shawn Balestracci
Revision 537ffdea50dff6bbe96d2aa5b37ca24b8d7c6617,
committed by Shawn Balestracci
· June 18th, 2012 @ 01:59 PM
Merge branch 'master' into devise
https://github.com/vegantech/sims/commit/537ffdea50dff6bbe96d2aa5b3...
18 changed files
-
A
app/views/interventions/comments/_edit_js.html.erb -
A
features/regular_user/student_flag_summary_report.feature -
M
app/controllers/interventions/comments_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/models/intervention.rb -
M
app/models/intervention_comment.rb -
M
app/views/interventions/_form.html.erb -
M
app/views/interventions/comments/_comment.html.erb -
M
app/views/interventions/comments/_comments.html.erb -
M
app/views/interventions/comments/_form.html.erb -
M
app/views/interventions/comments/_index.html.erb -
M
app/views/interventions/comments/edit.js.rjs -
M
app/views/reports/student_flag_summary.html.erb -
M
features/step_definitions/custom_probe.rb -
M
lib/tasks/verify_rcov.rake -
M
spec/controllers/interventions_controller_spec.rb -
M
spec/models/intervention_comment_spec.rb -
M
spec/models/intervention_spec.rb