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

7e5137d0

Commit 7e5137d0 authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents f251e0d7 5ec3f92a

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/users_controller.rb 4 additions, 1 deletion

app/controllers/users_controller.rb
app/helpers/collections_helper.rb 1 addition, 1 deletion

app/helpers/collections_helper.rb
app/models/collection.rb 2 additions, 1 deletion

app/models/collection.rb
app/policies/collection_policy.rb 20 additions, 0 deletions

app/policies/collection_policy.rb
app/views/users/show.html.erb 2 additions, 2 deletions

app/views/users/show.html.erb

with 29 additions and 5 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