Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

dfb5913f

Commit dfb5913f authored 7 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into dspace-sync

parents d8de3373 333f5bb3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/publisher_controller.rb 8 additions, 4 deletions

app/controllers/concerns/publisher_controller.rb
app/models/learning_object.rb 1 addition, 1 deletion

app/models/learning_object.rb
app/models/user.rb 4 additions, 0 deletions

app/models/user.rb
app/policies/learning_object_policy.rb 2 additions, 2 deletions

app/policies/learning_object_policy.rb
app/policies/publisher_policy.rb 5 additions, 1 deletion

app/policies/publisher_policy.rb
config/routes.rb 4 additions, 3 deletions

config/routes.rb
db/seeds/licenses.rb 1 addition, 0 deletions

db/seeds/licenses.rb
spec/acceptance/learning_objects_spec.rb 2 additions, 2 deletions

spec/acceptance/learning_objects_spec.rb
spec/acceptance/users_spec.rb 15 additions, 0 deletions

spec/acceptance/users_spec.rb

with 42 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment