Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

d45dbdce

Commit d45dbdce authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/add-status-text-to-notifications' into 'develop'

Add status text to notifications (mentions and reposts)

Closes #696

See merge request pleroma/pleroma!897

parents ca5d894e 0245ce84

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/metadata/utils.ex 2 additions, 2 deletions

lib/pleroma/web/metadata/utils.ex
lib/pleroma/web/push/push.ex 31 additions, 9 deletions

lib/pleroma/web/push/push.ex
mix.exs 1 addition, 1 deletion

mix.exs
mix.lock 4 additions, 4 deletions

mix.lock
test/support/factory.ex 7 additions, 7 deletions

test/support/factory.ex
test/web/push/push_test.exs 53 additions, 0 deletions

test/web/push/push_test.exs

with 98 additions and 23 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