Browse code Merge pull request #28 from DMPRoadmap/development Latest CDL changes pulled through Roadmap dev
commit a654d2c9669a8c7e32499216a243194c2497e737 2 parents aa43269 + f072221 Ray Carrick authored on 11 Apr 2017 GitHub committed on 11 Apr 2017

Showing 17 changed files

• app/controllers/projects_controller.rb
• app/controllers/sessions_controller.rb
• app/controllers/suggested_answers_controller.rb
• app/controllers/user_identifiers_controller.rb
• app/controllers/users/omniauth_shibboleth_request_controller.rb
• app/controllers/users_controller.rb
• app/policies/user_identifier_policy.rb
• app/views/plans/show_export.html.erb
• config/application.rb
• lib/assets/javascripts/jquery.timeago.js
• test/functional/plans_controller_test.rb
• test/functional/sessions_controller_test.rb
• test/functional/suggested_answers_controller_test.rb
• test/functional/token_permission_types_controller_test.rb
• test/functional/user_identifiers_controller_test.rb
• test/functional/users/omniauth_shibboleth_request_controller_test.rb
• test/functional/users_controller_test.rb

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

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

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

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

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

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

Ignore Space Show notes View app/policies/user_identifier_policy.rb 0 → 100644

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View lib/assets/javascripts/jquery.timeago.js

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

Ignore Space Show notes View test/functional/sessions_controller_test.rb 0 → 100644

Ignore Space Show notes View test/functional/suggested_answers_controller_test.rb 0 → 100644

Ignore Space Show notes View test/functional/token_permission_types_controller_test.rb 0 → 100644

Ignore Space Show notes View test/functional/user_identifiers_controller_test.rb 0 → 100644

Ignore Space Show notes View test/functional/users/omniauth_shibboleth_request_controller_test.rb 0 → 100644

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

Show line notes below