Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
413
Issues
413
List
Boards
Labels
Service Desk
Milestones
Merge Requests
65
Merge Requests
65
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
pleroma
Commits
df5e048c
Commit
df5e048c
authored
Jun 22, 2020
by
feld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not need a function to provide fallback value with default defined in config.exs
parent
bf8310f3
Pipeline
#27556
passed with stages
in 18 minutes and 56 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
lib/pleroma/web/mastodon_api/views/instance_view.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex
+1
-6
No files found.
lib/pleroma/web/mastodon_api/views/instance_view.ex
View file @
df5e048c
...
...
@@ -23,7 +23,7 @@ def render("show.json", _) do
streaming_api:
Pleroma
.
Web
.
Endpoint
.
websocket_url
()
},
stats:
Pleroma
.
Stats
.
get_stats
(),
thumbnail:
instance_thumbnail
(
),
thumbnail:
Keyword
.
get
(
instance
,
:instance_thumbnail
),
languages:
[
"en"
],
registrations:
Keyword
.
get
(
instance
,
:registrations_open
),
# Extra (not present in Mastodon):
...
...
@@ -88,9 +88,4 @@ def federation do
end
|>
Map
.
put
(
:enabled
,
Config
.
get
([
:instance
,
:federating
]))
end
defp
instance_thumbnail
do
Pleroma
.
Config
.
get
([
:instance
,
:instance_thumbnail
])
||
"
#{
Pleroma
.
Web
.
base_url
()
}
/instance/thumbnail.jpeg"
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