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

d918e0b5

Commit d918e0b5 authored 7 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

Merge branch 'fix-activities-test' into 'master'

Fix activities test

See merge request !442

parents 4b32941d 17abcf0e

No related branches found

No related tags found

Loading

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, 3 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 9 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