Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
1dcc700c
Commit
1dcc700c
authored
Apr 01, 2018
by
lain
Browse files
Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable See merge request
!88
parents
5fa8237b
4bf86d4c
Pipeline
#1049
passed with stage
in 3 minutes and 16 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
config/config.exs
View file @
1dcc700c
...
...
@@ -49,6 +49,7 @@
name:
"Pleroma"
,
email:
"example@example.com"
,
limit:
5000
,
upload_limit:
16_000_000
,
registrations_open:
true
,
federating:
true
...
...
lib/pleroma/web/endpoint.ex
View file @
1dcc700c
...
...
@@ -34,7 +34,8 @@ defmodule Pleroma.Web.Endpoint do
Plug
.
Parsers
,
parsers:
[
:urlencoded
,
:multipart
,
:json
],
pass:
[
"*/*"
],
json_decoder:
Jason
json_decoder:
Jason
,
length:
Application
.
get_env
(
:pleroma
,
:instance
)
|>
Keyword
.
get
(
:upload_limit
)
)
plug
(
Plug
.
MethodOverride
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment