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

2f2db256

Commit 2f2db256 authored 8 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'show-public-collections' into 'master'

Show public collections

See merge request !366

parents 171e7bc9 12bc089c

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/publisher_controller.rb 14 additions, 10 deletions

app/controllers/concerns/publisher_controller.rb
app/controllers/v1/collections_controller.rb 1 addition, 1 deletion

app/controllers/v1/collections_controller.rb
app/models/concerns/followable.rb 4 additions, 0 deletions

app/models/concerns/followable.rb
app/policies/publisher_policy.rb 19 additions, 6 deletions

app/policies/publisher_policy.rb
app/policies/user_policy.rb 2 additions, 0 deletions

app/policies/user_policy.rb
app/serializers/collection_serializer.rb 6 additions, 1 deletion

app/serializers/collection_serializer.rb

with 46 additions and 18 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