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

282a9355

Verified Commit 282a9355 authored 5 years ago by Alexander Strizhakov

Downloads
- Patches
- Plain Diff

merging release default config on app start

parent 953aece8

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/mix/tasks/pleroma/docs.ex 1 addition, 1 deletion

lib/mix/tasks/pleroma/docs.ex
lib/pleroma/application.ex 1 addition, 0 deletions

lib/pleroma/application.ex
lib/pleroma/config/holder.ex 31 additions, 7 deletions

lib/pleroma/config/holder.ex
lib/pleroma/config/loader.ex 11 additions, 21 deletions

lib/pleroma/config/loader.ex
lib/pleroma/config/transfer_task.ex 1 addition, 1 deletion

lib/pleroma/config/transfer_task.ex
lib/pleroma/docs/json.ex 1 addition, 1 deletion

lib/pleroma/docs/json.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 1 addition, 1 deletion

lib/pleroma/web/admin_api/admin_api_controller.ex
test/config/holder_test.exs 8 additions, 8 deletions

test/config/holder_test.exs
test/config/loader_test.exs 2 additions, 17 deletions

test/config/loader_test.exs
test/config/transfer_task_test.exs 1 addition, 1 deletion

test/config/transfer_task_test.exs

with 58 additions and 58 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