Browse code Merge pull request #832 from DigitalCurationCentre/rebase_mvp_off_dev Merge Development into CDL-MVP dev
commit cf44151bf488d38f39f13807066667212a518f29 2 parents c92a74f + 232ccf8 Brian Riley authored on 16 Nov 2017 GitHub committed on 16 Nov 2017

Showing 14 changed files

• CODE_OF_CONDUCT.md
• ISSUE_TEMPLATE.md
• PULL_REQUEST_TEMPLATE.md
• app/controllers/answers_controller.rb
• app/controllers/notes_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/models/plan.rb
• app/models/template.rb
• db/seeds.rb
• test/functional/answers_controller_test.rb
• test/functional/notes_controller_test.rb
• test/integration/answer_locking_test.rb
• test/integration/template_selection_test.rb

Ignore Space Show notes View CODE_OF_CONDUCT.md 0 → 100644

Ignore Space Show notes View ISSUE_TEMPLATE.md 0 → 100644

Ignore Space Show notes View PULL_REQUEST_TEMPLATE.md 0 → 100644

Ignore Space Show notes View app/controllers/answers_controller.rb

Ignore Space Show notes View app/controllers/notes_controller.rb

Ignore Space Show notes View app/controllers/phases_controller.rb

Ignore Space Show notes View app/controllers/plans_controller.rb

Ignore Space Show notes View app/models/plan.rb

Ignore Space Show notes View app/models/template.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View test/functional/answers_controller_test.rb

Ignore Space Show notes View test/functional/notes_controller_test.rb

Ignore Space Show notes View test/integration/answer_locking_test.rb

Ignore Space Show notes View test/integration/template_selection_test.rb

Show line notes below