Changeset [616765b9f69d1c3346acc13fe7eda37e3644865c] by Shawn Balestracci
Revision 616765b9f69d1c3346acc13fe7eda37e3644865c,
committed by Shawn Balestracci
· March 6th, 2014 @ 10:36 PM
Merge branch 'rm_production' into wip-open
Conflicts:
app/models/grouped_progress_entry.rb
app/models/grouped_progress_entry/score_comment.rb
https://github.com/vegantech/sims/commit/616765b9f69d1c3346acc13fe7...
15 changed files
-
A
app/views/interventions/end/_link.html.erb -
A
app/views/interventions/end/_reasons.html.erb -
A
spec/javascripts/grouped_progress_entries_spec.coffee -
A
spec/javascripts/helpers/jasmine-jquery.js -
M
Gemfile.lock -
M
app/assets/javascripts/coffee/grouped_progress_entries.js.coffee -
M
app/controllers/grouped_progress_entries_controller.rb -
M
app/models/grouped_progress_entry.rb -
M
app/models/grouped_progress_entry/score_comment.rb -
M
app/views/grouped_progress_entries/edit.html.erb -
M
app/views/interventions/_edit_view.html.erb -
M
app/views/login/_whats_new.html.erb -
M
config/routes.rb -
M
spec/controllers/grouped_progress_entries_controller_spec.rb -
M
spec/models/grouped_progress_entry_spec.rb