Browse code resolved merge conflicts dev
commit d8297b7f329f005e391b3c1c8e270679442f7b56 2 parents 1bcfe8d + 6f1f96f briley authored on 30 Jan 2017

Showing 53 changed files

• Gemfile
• app/models/answer.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/question_format.rb
• app/models/question_option.rb
• app/models/section.rb
• app/models/suggested_answer.rb
• app/models/template.rb
• db/migrate/20150809210811_add_field_to_questions.rb
• db/migrate/20151208142029_add_field_to_guidances.rb
• db/migrate/20151208142836_update_field_in_guidance_groups.rb
• db/migrate/20161021100420_single_organisation_for_users.rb
• db/migrate/20161122152339_new_plan_template_structure.rb
• db/migrate/20161205095624_replacing_organisation_types_with_bitflags.rb
• db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb
• db/migrate/20161206122926_add_foreign_keys.rb
• db/migrate/20161208122123_single_group_for_guidance.rb
• db/migrate/20170124235829_add_visibility_to_plans.rb
• db/migrate/20170124235829_add_visibility_to_projects.rb
• db/schema.rb
• db/seeds.rb
• test/fixtures/answers.yml
• test/fixtures/comments.yml
• test/fixtures/dmptemplates.yml
• test/fixtures/exported_plans.yml
• test/fixtures/guidance_groups.yml
• test/fixtures/guidances.yml
• test/fixtures/identifier_schemes.yml
• test/fixtures/languages.yml
• test/fixtures/option_warnings.yml
• test/fixtures/options.yml
• test/fixtures/organisation_types.yml
• test/fixtures/organisations.yml
• test/fixtures/phases.yml
• test/fixtures/plan_sections.yml
• test/fixtures/plans.yml
• test/fixtures/project_groups.yml
• test/fixtures/projects.yml
• test/fixtures/question_formats.yml
• test/fixtures/questions.yml
• test/fixtures/roles.yml
• test/fixtures/sections.yml
• test/fixtures/templates.yml
• test/fixtures/themes.yml
• test/fixtures/token_permission_types.yml
• test/fixtures/users.yml
• test/fixtures/versions.yml
• test/test_helper.rb
• test/unit/answer_test.rb
• test/unit/dmptemplate_test.rb
• test/unit/template_test.rb

Ignore Space Show notes View Gemfile

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View db/migrate/20150809210811_add_field_to_questions.rb

Ignore Space Show notes View db/migrate/20151208142029_add_field_to_guidances.rb

Ignore Space Show notes View db/migrate/20151208142836_update_field_in_guidance_groups.rb

Ignore Space Show notes View db/migrate/20161021100420_single_organisation_for_users.rb

Ignore Space Show notes View db/migrate/20161122152339_new_plan_template_structure.rb

Ignore Space Show notes View db/migrate/20161205095624_replacing_organisation_types_with_bitflags.rb

Ignore Space Show notes View db/migrate/20161205095625_replacing_plan_roles_with_bitflags.rb

Ignore Space Show notes View db/migrate/20161206122926_add_foreign_keys.rb

Ignore Space Show notes View db/migrate/20161208122123_single_group_for_guidance.rb

Ignore Space Show notes View db/migrate/20170124235829_add_visibility_to_plans.rb 0 → 100644

Show notes View db/migrate/20170124235829_add_visibility_to_projects.rb 100644 → 0

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Show notes View test/fixtures/answers.yml 100644 → 0

Show notes View test/fixtures/comments.yml 100644 → 0

Show notes View test/fixtures/dmptemplates.yml 100644 → 0

Show notes View test/fixtures/exported_plans.yml 100644 → 0

Show notes View test/fixtures/guidance_groups.yml 100644 → 0

Show notes View test/fixtures/guidances.yml 100644 → 0

Show notes View test/fixtures/identifier_schemes.yml 100644 → 0

Show notes View test/fixtures/languages.yml 100644 → 0

Show notes View test/fixtures/option_warnings.yml 100644 → 0

Show notes View test/fixtures/options.yml 100644 → 0

Show notes View test/fixtures/organisation_types.yml 100644 → 0

Show notes View test/fixtures/organisations.yml 100644 → 0

Show notes View test/fixtures/phases.yml 100644 → 0

Show notes View test/fixtures/plan_sections.yml 100644 → 0

Show notes View test/fixtures/plans.yml 100644 → 0

Show notes View test/fixtures/project_groups.yml 100644 → 0

Show notes View test/fixtures/projects.yml 100644 → 0

Show notes View test/fixtures/question_formats.yml 100644 → 0

Show notes View test/fixtures/questions.yml 100644 → 0

Show notes View test/fixtures/roles.yml 100644 → 0

Show notes View test/fixtures/sections.yml 100644 → 0

Show notes View test/fixtures/templates.yml 100644 → 0

Show notes View test/fixtures/themes.yml 100644 → 0

Show notes View test/fixtures/token_permission_types.yml 100644 → 0

Show notes View test/fixtures/users.yml 100644 → 0

Show notes View test/fixtures/versions.yml 100644 → 0

Ignore Space Show notes View test/test_helper.rb

Ignore Space Show notes View test/unit/answer_test.rb

Show notes View test/unit/dmptemplate_test.rb 100644 → 0

Ignore Space Show notes View test/unit/template_test.rb 0 → 100644

Show line notes below