Merge branch 'develop' into feature/local-only-scope
Showing
- .gitlab-ci.yml 15 additions, 13 deletions.gitlab-ci.yml
- .gitlab/issue_templates/Bug.md 20 additions, 0 deletions.gitlab/issue_templates/Bug.md
- .gitlab/merge_request_templates/Release.md 5 additions, 0 deletions.gitlab/merge_request_templates/Release.md
- CHANGELOG.md 59 additions, 0 deletionsCHANGELOG.md
- COPYING 2 additions, 2 deletionsCOPYING
- Dockerfile 2 additions, 2 deletionsDockerfile
- benchmarks/load_testing/activities.ex 557 additions, 0 deletionsbenchmarks/load_testing/activities.ex
- benchmarks/load_testing/fetcher.ex 456 additions, 227 deletionsbenchmarks/load_testing/fetcher.ex
- benchmarks/load_testing/generator.ex 0 additions, 409 deletionsbenchmarks/load_testing/generator.ex
- benchmarks/load_testing/helper.ex 10 additions, 7 deletionsbenchmarks/load_testing/helper.ex
- benchmarks/load_testing/users.ex 169 additions, 0 deletionsbenchmarks/load_testing/users.ex
- benchmarks/mix/tasks/pleroma/benchmarks/tags.ex 10 additions, 14 deletionsbenchmarks/mix/tasks/pleroma/benchmarks/tags.ex
- benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex 70 additions, 0 deletionsbenchmarks/mix/tasks/pleroma/benchmarks/timelines.ex
- benchmarks/mix/tasks/pleroma/load_testing.ex 32 additions, 104 deletionsbenchmarks/mix/tasks/pleroma/load_testing.ex
- config/benchmark.exs 1 addition, 3 deletionsconfig/benchmark.exs
- config/config.exs 50 additions, 28 deletionsconfig/config.exs
- config/description.exs 274 additions, 52 deletionsconfig/description.exs
- config/test.exs 4 additions, 0 deletionsconfig/test.exs
- coveralls.json 6 additions, 0 deletionscoveralls.json
- docs/API/admin_api.md 92 additions, 0 deletionsdocs/API/admin_api.md
Loading
Please register or sign in to comment