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

71a7cea7

Commit 71a7cea7 authored 7 years ago by abcang Committed by Eugen Rochko 7 years ago

Downloads
- Patches
- Plain Diff

Keep notification when muting_notifications is true (#7311)

* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test

parent d0cdd5cf

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/mastodon/reducers/notifications.js 1 addition, 1 deletion

app/javascript/mastodon/reducers/notifications.js
app/models/concerns/account_interactions.rb 1 addition, 0 deletions

app/models/concerns/account_interactions.rb
app/services/mute_service.rb 6 additions, 2 deletions

app/services/mute_service.rb
spec/models/concerns/account_interactions_spec.rb 26 additions, 36 deletions

spec/models/concerns/account_interactions_spec.rb

with 34 additions and 39 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