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

d81acb5f

Commit d81acb5f authored 4 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch 'description-limits' into 'develop'

Add limits to image descriptions

See merge request pleroma/pleroma!2724

parents 2a323d37 58da5759

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
config/config.exs 1 addition, 0 deletions

config/config.exs
docs/API/differences_in_mastoapi_responses.md 2 additions, 0 deletions

docs/API/differences_in_mastoapi_responses.md
docs/configuration/cheatsheet.md 1 addition, 0 deletions

docs/configuration/cheatsheet.md
lib/pleroma/upload.ex 8 additions, 1 deletion

lib/pleroma/upload.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex 2 additions, 0 deletions

lib/pleroma/web/mastodon_api/views/instance_view.ex
test/upload_test.exs 13 additions, 0 deletions

test/upload_test.exs
test/web/mastodon_api/controllers/instance_controller_test.exs 3 additions, 1 deletion

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

with 31 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