Browse code Merge branch 'DMPRoadmap-development' into development resolve various conflicts dev
commit ee7380bcbc17c487f54c3d8ead63b27ad87515aa 2 parents cb3c334 + e7882fc ray.carrick authored on 16 Mar 2017

Showing 25 changed files

• .travis.yml
• Gemfile.lock
• app/controllers/orgs_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/users/omniauth_callbacks_controller.rb
• db/migrate/20170130173612_move_orcid_id_from_users_to_user_identifiers.rb
• db/migrate/20170303220255_remove_orcid_id_from_users.rb
• db/schema.rb
• db/seeds.rb
• lib/tasks/migrate.rake
• test/fixtures/.gitkeep
• test/functional/answers_controller_test.rb
• test/functional/application_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/models/plan_guidance_group_test.rb
• test/models/template_test.rb
• test/test_helper.rb
• test/unit/answer_test.rb
• test/unit/guidance_test.rb
• test/unit/phase_test.rb
• test/unit/plan_test.rb
• test/unit/settings/plan_test.rb
• test/unit/suggested_answer_test.rb
• test/unit/template_test.rb

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile.lock

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

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

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

Ignore Space Show notes View app/controllers/users/omniauth_callbacks_controller.rb

Show notes View db/migrate/20170130173612_move_orcid_id_from_users_to_user_identifiers.rb 100644 → 0

Ignore Space Show notes View db/migrate/20170303220255_remove_orcid_id_from_users.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View lib/tasks/migrate.rake

Show notes View test/fixtures/.gitkeep 100644 → 0

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

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

Ignore Space Show notes View test/functional/users/omniauth_callbacks_controller_test.rb

Show notes View test/models/plan_guidance_group_test.rb 100644 → 0

Show notes View test/models/template_test.rb 100644 → 0

Ignore Space Show notes View test/test_helper.rb

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

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

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

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

Ignore Space Show notes View test/unit/settings/plan_test.rb

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

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

Show line notes below