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

b5493c32

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

Downloads
- Plain Diff

Merge branch 'fix_activity_draft' into 'master'

Fix activity draft

See merge request !457

parents 9656aec2 9a74443a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/feed_controller.rb 7 additions, 9 deletions

app/controllers/v1/feed_controller.rb
app/models/concerns/trackable.rb 2 additions, 1 deletion

app/models/concerns/trackable.rb
app/models/learning_object.rb 5 additions, 0 deletions

app/models/learning_object.rb
app/policies/activity_policy.rb 1 addition, 1 deletion

app/policies/activity_policy.rb

with 15 additions and 11 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