Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

7447c80e

Commit 7447c80e authored 5 years ago by rinpatch

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'revert-a54aa5af' into 'develop'

Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"

Closes #1488

See merge request pleroma/pleroma!2083

parents 0193b086 e71a13ad

Branches

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 0 additions, 1 deletion

CHANGELOG.md
lib/pleroma/stats.ex 5 additions, 67 deletions

lib/pleroma/stats.ex
test/stats_test.exs 0 additions, 53 deletions

test/stats_test.exs
test/web/mastodon_api/controllers/instance_controller_test.exs 1 addition, 9 deletions

...web/mastodon_api/controllers/instance_controller_test.exs

with 6 additions and 130 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