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

e1193ca5

Commit e1193ca5 authored 8 years ago by Bernardo Chagas

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into show-public-collections

parents 581940fa 9fb087fb

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

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

app/controllers/v1/collections_controller.rb
app/controllers/v1/contacts_controller.rb 52 additions, 0 deletions

app/controllers/v1/contacts_controller.rb
app/controllers/v1/omniauth_callbacks_controller.rb 2 additions, 2 deletions

app/controllers/v1/omniauth_callbacks_controller.rb
app/controllers/v1/suggestions_controller.rb 53 additions, 0 deletions

app/controllers/v1/suggestions_controller.rb
app/models/collection_item.rb 5 additions, 0 deletions

app/models/collection_item.rb
app/models/contact.rb 11 additions, 0 deletions

app/models/contact.rb
app/models/suggestion.rb 13 additions, 0 deletions

app/models/suggestion.rb
app/policies/collection_policy.rb 2 additions, 8 deletions

app/policies/collection_policy.rb
app/serializers/collection_serializer.rb 13 additions, 1 deletion

app/serializers/collection_serializer.rb
app/serializers/contact_serializer.rb 4 additions, 0 deletions

app/serializers/contact_serializer.rb
app/serializers/suggestion_serializer.rb 3 additions, 0 deletions

app/serializers/suggestion_serializer.rb
config/routes.rb 2 additions, 0 deletions

config/routes.rb
db/migrate/20170207122721_create_contacts.rb 11 additions, 0 deletions

db/migrate/20170207122721_create_contacts.rb
db/migrate/20170208111714_create_suggestions.rb 12 additions, 0 deletions

db/migrate/20170208111714_create_suggestions.rb

with 184 additions and 12 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