Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4bc62516

Unverified Commit 4bc62516 authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago

Downloads
- Patches
- Plain Diff

Fix bug in relationships API introduced by #6482 (#6527)

It was merge when it needed to be deep_merge. And added some tests

parent 61ed133f

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/api/v1/accounts/relationships_controller.rb 1 addition, 1 deletion

app/controllers/api/v1/accounts/relationships_controller.rb
app/presenters/account_relationships_presenter.rb 1 addition, 1 deletion

app/presenters/account_relationships_presenter.rb
spec/controllers/api/v1/accounts/relationships_controller_spec.rb 22 additions, 0 deletions

...trollers/api/v1/accounts/relationships_controller_spec.rb

with 24 additions and 2 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