Browse code Merge pull request #48 from DMPRoadmap/development Sync with Roadmap. dev
commit 824c58fccdc46b8577714f9b527d55684ea1f058 2 parents 711c52e + cbe3cf0 Jimmy Angelakos authored on 20 Oct 2017 GitHub committed on 20 Oct 2017

Showing 15 changed files

• app/controllers/annotations_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/templates_controller.rb
• app/models/plan.rb
• app/models/settings/template.rb
• app/models/user.rb
• app/views/templates/admin_index.html.erb
• db/migrate/20170702012742_ensure_indexes_in_place.rb
• db/seeds.rb
• lib/tasks/bugfix.rake
• lib/tasks/migrate.rake
• test/functional/roles_controller_test.rb
• test/functional/templates_controller_test.rb

Ignore Space Show notes View app/controllers/annotations_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/controllers/roles_controller.rb

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

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

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

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

Ignore Space Show notes View app/views/templates/admin_index.html.erb

Ignore Space Show notes View db/migrate/20170702012742_ensure_indexes_in_place.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View lib/tasks/bugfix.rake 0 → 100644

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

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

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

Show line notes below