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

5d215fd8

Commit 5d215fd8 authored 4 years ago by feld

Downloads
- Plain Diff

Merge branch 'config-behaviours-runtime' into 'develop'

Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request !2755

parents 8f9ee694 4347d2de

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config/description.exs 3 additions, 11 deletions

config/description.exs
lib/pleroma/application.ex 1 addition, 0 deletions

lib/pleroma/application.ex
lib/pleroma/docs/generator.ex 21 additions, 10 deletions

lib/pleroma/docs/generator.ex
lib/pleroma/docs/json.ex 14 additions, 7 deletions

lib/pleroma/docs/json.ex
lib/pleroma/docs/markdown.ex 5 additions, 0 deletions

lib/pleroma/docs/markdown.ex
lib/pleroma/web/admin_api/controllers/config_controller.ex 1 addition, 3 deletions

lib/pleroma/web/admin_api/controllers/config_controller.ex
test/docs/generator_test.exs 2 additions, 10 deletions

test/docs/generator_test.exs

with 47 additions and 41 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