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

975fb34b

Commit 975fb34b authored 7 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

Merge branch 'revert-ee12496c' into 'master'

Revert "Merge branch 'issue/275' into 'master'"

See merge request portalmec/portalmec!473

parents ee12496c 34cce86b

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/learning_objects/attachment_controller.rb 4 additions, 9 deletions

app/controllers/v1/learning_objects/attachment_controller.rb
app/models/learning_object/attachment.rb 4 additions, 3 deletions

app/models/learning_object/attachment.rb
app/serializers/learning_object/attachment_serializer.rb 1 addition, 2 deletions

app/serializers/learning_object/attachment_serializer.rb
db/migrate/20171205120824_update_learning_object_attachments_foreign_key.rb 6 additions, 0 deletions

...5120824_update_learning_object_attachments_foreign_key.rb
db/migrate/20171205140057_remove_learning_object_attachments_foreign_key_on_cascade.rb 5 additions, 0 deletions

...ove_learning_object_attachments_foreign_key_on_cascade.rb
db/migrate/20180123124526_add_foreign_key_to_learning_object_attachments.rb 0 additions, 8 deletions

...3124526_add_foreign_key_to_learning_object_attachments.rb

with 20 additions and 22 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