Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
05cd0cc7
Commit
05cd0cc7
authored
4 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Remove :fed_sockets settings
parent
aa2b9102
No related branches found
Branches containing commit
No related tags found
1 merge request
!186
Add Pleroma.Web.Endpoint.MetricsExporter settings
Pipeline
#33476
passed
4 years ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/views/settings/components/Http.vue
+1
-11
1 addition, 11 deletions
src/views/settings/components/Http.vue
src/views/settings/components/tabs.js
+1
-1
1 addition, 1 deletion
src/views/settings/components/tabs.js
with
3 additions
and
12 deletions
CHANGELOG.md
+
1
−
0
View file @
05cd0cc7
...
...
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Move
`:restrict_unauthenticated`
settings from Authentication tab to Instance tab
-
Replace regular inputs with textareas for setting welcome messages in the Settings section
-
Update rendering Moderation Log Messages so that all usernames are links to the pages of the corresponding users in Admin-FE
-
Remove Websocket based federation settings
### Fixed
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/components/Http.vue
+
1
−
11
View file @
05cd0cc7
...
...
@@ -11,14 +11,10 @@
<el-form
:model=
"httpSecurityData"
:label-position=
"labelPosition"
:label-width=
"labelWidth"
>
<setting
:setting-group=
"httpSecurity"
:data=
"httpSecurityData"
/>
</el-form>
<el-divider
v-if=
"
httpSecurity
"
class=
"divider thick-line"
/>
<el-divider
v-if=
"
webCacheTtl
"
class=
"divider thick-line"
/>
<el-form
:model=
"webCacheTtlData"
:label-position=
"labelPosition"
:label-width=
"labelWidth"
>
<setting
:setting-group=
"webCacheTtl"
:data=
"webCacheTtlData"
/>
</el-form>
<el-divider
v-if=
"fedSockets"
class=
"divider thick-line"
/>
<el-form
:model=
"fedSocketsData"
:label-position=
"labelPosition"
:label-width=
"labelWidth"
>
<setting
:setting-group=
"fedSockets"
:data=
"fedSocketsData"
/>
</el-form>
<div
class=
"submit-button-container"
>
<el-button
class=
"submit-button"
type=
"primary"
@
click=
"onSubmit"
>
Submit
</el-button>
</div>
...
...
@@ -44,12 +40,6 @@ export default {
corsPlugData
()
{
return
_
.
get
(
this
.
settings
.
settings
,
[
'
:cors_plug
'
])
||
{}
},
fedSockets
()
{
return
this
.
settings
.
description
.
find
(
setting
=>
setting
.
key
===
'
:fed_sockets
'
)
},
fedSocketsData
()
{
return
_
.
get
(
this
.
settings
.
settings
,
[
'
:pleroma
'
,
'
:fed_sockets
'
])
||
{}
},
http
()
{
return
this
.
settings
.
description
.
find
(
setting
=>
setting
.
key
===
'
:http
'
)
},
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/components/tabs.js
+
1
−
1
View file @
05cd0cc7
...
...
@@ -26,7 +26,7 @@ export const tabs = description => {
},
'
http
'
:
{
label
:
'
settings.http
'
,
settings
:
[
'
:cors_plug
'
,
'
:http
'
,
'
:fed_sockets
'
,
'
:http_security
'
,
'
:web_cache_ttl
'
]
settings
:
[
'
:cors_plug
'
,
'
:http
'
,
'
:http_security
'
,
'
:web_cache_ttl
'
]
},
'
instance
'
:
{
label
:
'
settings.instance
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment