Merge branch 'testing_and_documenting'
dev
commit 7be4b1289e92fb392328a7da67fb2688895183c9
2 parents 7404eb1 + a15396f
@xsrust xsrust authored on 26 Jul 2016
Showing 17 changed files
View
.gitignore
View
Gemfile
View
app/controllers/api/v0/base_controller.rb
View
app/controllers/api/v0/guidance_groups_controller.rb
View
app/controllers/token_permission_types_controller.rb
View
app/mailers/user_mailer.rb
View
app/views/api/v0/guidance_groups/index.json.jbuilder
View
app/views/users/admin_api_update.html.erb 0 → 100644
View
app/views/users/admin_index.html.erb
View
db/schema.rb
View
test/fixtures/dmptemplates_guidance_groups.yml 100644 → 0
View
test/fixtures/guidances.yml
View
test/fixtures/org_token_permissions.yml
View
test/fixtures/token_permission.yml 100644 → 0
View
test/fixtures/token_permission_type.yml 100644 → 0
View
test/fixtures/token_permission_types.yml 100644 → 0
View
test/functional/api_projects_controller_test.rb 0 → 100644