merge optimistic locking into dev
dev
commit bf5403c6d85efcadc7f0524c74ddc572887ce291
2 parents d4565e7 + 51c78fc
@ray.carrick ray.carrick authored on 1 Mar 2017
Showing 13 changed files
View
app/controllers/answers_controller.rb
View
app/models/answer.rb
View
app/models/question.rb
View
app/models/question_format.rb
View
app/views/answers/update.js.erb 0 → 100644
View
app/views/phases/_answer.html.erb 0 → 100644
View
app/views/phases/_answer_form.html.erb
View
app/views/phases/edit.html.erb
View
db/migrate/20170227122226_add_locking_columns.rb 0 → 100644
View
db/migrate/20170301105806_add_type_column_to_question_format.rb 0 → 100644
View
db/schema.rb
View
lib/assets/javascripts/plans.js
View
lib/assets/stylesheets/bootstrap_and_overrides.css.less