Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

610236d6

Commit 610236d6 authored 5 years ago by Ivan Tashkinov

Downloads
- Plain Diff

[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
#	docs/config.md

parents e127b9ab 9c64a257

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/config.md 701 additions, 1 deletion

docs/config.md
lib/pleroma/docs/markdown.ex 2 additions, 2 deletions

lib/pleroma/docs/markdown.ex
lib/pleroma/user.ex 15 additions, 1 deletion

lib/pleroma/user.ex
lib/pleroma/user/info.ex 17 additions, 0 deletions

lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex 4 additions, 0 deletions

...a/web/mastodon_api/controllers/mastodon_api_controller.ex
mix.exs 1 addition, 2 deletions

mix.exs
test/activity_test.exs 6 additions, 2 deletions

test/activity_test.exs
test/user_test.exs 53 additions, 20 deletions

test/user_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 51 additions, 2 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 852 additions and 30 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