Browse code merged conflicts dev
commit e9107c233b09c4f96e8037bf97c427461828dbf6 2 parents 7d24529 + 608d02d briley authored on 3 Aug 2016

Showing 20 changed files

• .gitignore
• Gemfile
• app/admin/token_permission.rb
• app/controllers/api/v0/base_controller.rb
• app/controllers/api/v0/guidance_groups_controller.rb
• app/controllers/token_permission_types_controller.rb
• app/mailers/user_mailer.rb
• app/models/token_permission.rb
• app/models/user.rb
• app/views/api/v0/guidance_groups/index.json.jbuilder
• app/views/users/admin_api_update.html.erb
• app/views/users/admin_index.html.erb
• db/schema.rb
• test/fixtures/dmptemplates_guidance_groups.yml
• test/fixtures/guidances.yml
• test/fixtures/org_token_permissions.yml
• test/fixtures/token_permission.yml
• test/fixtures/token_permission_type.yml
• test/fixtures/users.yml
• test/functional/api_projects_controller_test.rb

Ignore Space Show notes View .gitignore

Ignore Space Show notes View Gemfile

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

Ignore Space Show notes View app/controllers/api/v0/base_controller.rb

Ignore Space Show notes View app/controllers/api/v0/guidance_groups_controller.rb

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

Ignore Space Show notes View app/mailers/user_mailer.rb

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

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

Ignore Space Show notes View app/views/api/v0/guidance_groups/index.json.jbuilder

Ignore Space Show notes View app/views/users/admin_api_update.html.erb 0 → 100644

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

Ignore Space Show notes View db/schema.rb

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

Ignore Space Show notes View test/fixtures/guidances.yml

Ignore Space Show notes View test/fixtures/org_token_permissions.yml 0 → 100644

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

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

Ignore Space Show notes View test/fixtures/users.yml

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

Show line notes below