Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

admin-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

55eb374d

Commit 55eb374d authored 4 years ago by Angelina Filippova

Downloads
- Plain Diff

Merge branch 'feature/update-mrf' into 'develop'

Show MRF settings that are enabled in MRF Policies setting

Closes #129 and #126

See merge request pleroma/admin-fe!145

parents d7eaf61a edd86b11

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/views/settings/components/Inputs.vue 1 addition, 1 deletion

src/views/settings/components/Inputs.vue
src/views/settings/components/MRF.vue 12 additions, 2 deletions

src/views/settings/components/MRF.vue
src/views/settings/components/inputComponents/SelectInputWithReducedLabels.vue 2 additions, 10 deletions

...mponents/inputComponents/SelectInputWithReducedLabels.vue

with 16 additions and 13 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