Browse code fixed merge conflicts in branding.yml and schema.rb dev
commit 700102b7ecc13113b994084a85ef43bf91e9022c 2 parents 5cc48ea + 614f886 briley authored on 25 Jan 2017

Showing 44 changed files

• Gemfile
• Gemfile.lock
• app/admin/organisation.rb
• app/admin/question.rb
• app/admin/role.rb
• app/admin/user.rb
• app/admin/user_role_type.rb
• app/admin/user_status.rb
• app/admin/user_type.rb
• app/controllers/plans_controller.rb
• app/models/dmptemplate.rb
• app/models/new_answer.rb
• app/models/new_phase.rb
• app/models/new_plan.rb
• app/models/new_question.rb
• app/models/new_section.rb
• app/models/new_suggested_answer.rb
• app/models/note.rb
• app/models/organisation.rb
• app/models/perm.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/question_option.rb
• app/models/role.rb
• app/models/template.rb
• app/models/theme.rb
• app/models/user.rb
• app/models/user_role_type.rb
• app/models/user_status.rb
• app/models/user_type.rb
• app/policies/plan_policy.rb
• app/views/plans/_answer_form.html.erb
• config/branding.yml
• config/environments/development.rb
• db/migrate/20161115105808_drop_unused_user_tables.rb
• db/migrate/20161115114309_drop_option_warning_table.rb
• db/migrate/20161115121831_remove_parent_id_from_questions.rb
• db/migrate/20161115123658_remove_unused_fields_from_roles.rb
• db/migrate/20161115124634_remove_unused_fields_from_organisations.rb
• db/migrate/20161115132137_remove_unused_fields_from_dmptemplates.rb
• db/migrate/20161115143222_rename_roles_to_perms.rb
• db/migrate/20161122152339_new_plan_template_structure.rb
• db/schema.rb
• db/seeds.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/admin/organisation.rb

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

Ignore Space Show notes View app/admin/role.rb

Ignore Space Show notes View app/admin/user.rb

Show notes View app/admin/user_role_type.rb 100644 → 0

Show notes View app/admin/user_status.rb 100644 → 0

Show notes View app/admin/user_type.rb 100644 → 0

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

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

Ignore Space Show notes View app/models/new_answer.rb 0 → 100644

Ignore Space Show notes View app/models/new_phase.rb 0 → 100644

Ignore Space Show notes View app/models/new_plan.rb 0 → 100644

Ignore Space Show notes View app/models/new_question.rb 0 → 100644

Ignore Space Show notes View app/models/new_section.rb 0 → 100644

Ignore Space Show notes View app/models/new_suggested_answer.rb 0 → 100644

Ignore Space Show notes View app/models/note.rb 0 → 100644

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

Ignore Space Show notes View app/models/perm.rb 0 → 100644

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_option.rb 0 → 100644

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

Ignore Space Show notes View app/models/template.rb 0 → 100644

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

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

Show notes View app/models/user_role_type.rb 100644 → 0

Show notes View app/models/user_status.rb 100644 → 0

Show notes View app/models/user_type.rb 100644 → 0

Ignore Space Show notes View app/policies/plan_policy.rb

Ignore Space Show notes View app/views/plans/_answer_form.html.erb

Ignore Space Show notes View config/branding.yml

Ignore Space Show notes View config/environments/development.rb

Ignore Space Show notes View db/migrate/20161115105808_drop_unused_user_tables.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115114309_drop_option_warning_table.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115121831_remove_parent_id_from_questions.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115123658_remove_unused_fields_from_roles.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115124634_remove_unused_fields_from_organisations.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115132137_remove_unused_fields_from_dmptemplates.rb 0 → 100644

Ignore Space Show notes View db/migrate/20161115143222_rename_roles_to_perms.rb 0 → 100644

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

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Show line notes below