Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

b6ae412f

Commit b6ae412f authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'runtime-static-plug' into 'develop'

Instance/Runtime static plug

See merge request pleroma/pleroma!567

parents 3879500c b1860fe8

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 1 deletion

.gitignore
config/config.exs 1 addition, 0 deletions

config/config.exs
lib/pleroma/plugs/instance_static.ex 54 additions, 0 deletions

lib/pleroma/plugs/instance_static.ex
lib/pleroma/web/endpoint.ex 4 additions, 0 deletions

lib/pleroma/web/endpoint.ex
lib/pleroma/web/ostatus/ostatus_controller.ex 1 addition, 1 deletion

lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex 1 addition, 1 deletion

lib/pleroma/web/router.ex
test/plugs/instance_static_test.exs 43 additions, 0 deletions

test/plugs/instance_static_test.exs

with 107 additions and 3 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