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

1510a6ee

Commit 1510a6ee authored 7 years ago by portalmecprod

Downloads
- Plain Diff

solving conflicts again

parents 05f9eda3 d918e0b5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/followable_controller.rb 1 addition, 1 deletion

app/controllers/concerns/followable_controller.rb
app/controllers/v1/collections_controller.rb 3 additions, 3 deletions

app/controllers/v1/collections_controller.rb
app/controllers/v1/feed_controller.rb 16 additions, 4 deletions

app/controllers/v1/feed_controller.rb
app/policies/followable_policy.rb 4 additions, 0 deletions

app/policies/followable_policy.rb
spec/acceptance/activities_spec.rb 4 additions, 2 deletions

spec/acceptance/activities_spec.rb

with 28 additions and 10 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