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
066fe1a6
Unverified
Commit
066fe1a6
authored
Jan 29, 2018
by
jeff
Browse files
use nil instead of empty string
parent
dffde663
Changes
2
Hide whitespace changes
Inline
Side-by-side
config/config.exs
View file @
066fe1a6
...
...
@@ -42,7 +42,7 @@
# Configures http settings, upstream proxy etc.
config
:pleroma
,
:http
,
proxy_url:
""
proxy_url:
nil
config
:pleroma
,
:instance
,
version:
version
,
...
...
lib/pleroma/http/http.ex
View file @
066fe1a6
...
...
@@ -4,9 +4,9 @@ defmodule Pleroma.HTTP do
def
process_request_options
(
options
)
do
config
=
Application
.
get_env
(
:pleroma
,
:http
,
[])
proxy
=
Keyword
.
get
(
config
,
:proxy_url
,
""
)
proxy
=
Keyword
.
get
(
config
,
:proxy_url
,
nil
)
case
proxy
do
""
->
options
nil
->
options
_
->
options
++
[
proxy:
proxy
]
end
end
...
...
Write
Preview
Markdown
is supported
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