pleroma/admin-fe
0
0
Fork 0
Code Issues 48 Pull requests 19 Projects Releases Packages Wiki Activity

Fix handling of keyless settings that come from the backend #414

Open
linafilippova wants to merge 27 commits from gitlab-mr-iid-182 into develop
pull from: gitlab-mr-iid-182
merge into: pleroma:develop
Conversation 1 Commits 27 Files changed 21 +376 -365
linafilippova commented 2020-11-14 23:24:09 +00:00
Member
Copy link

Blocked by pleroma/pleroma#6495

Blocked by https://git.pleroma.social/pleroma/pleroma/pulls/6495
maxf commented 2020-12-18 20:08:39 +00:00
Member
Copy link

tenor__1_

![tenor__1_](/attachments/e3e5710d-d4d8-4893-88bb-66b206e267d7)
tenor__1_.gif
57 KiB 
# Conflicts:
#   CHANGELOG.md
This pull request has changes conflicting with the target branch.
  • CHANGELOG.md
  • src/lang/en.js
  • src/store/modules/normalizers.js
  • src/store/modules/settings.js
  • src/views/settings/components/Authentication.vue
  • src/views/settings/components/Inputs.vue
  • src/views/settings/components/Logger.vue
  • src/views/settings/components/inputComponents/PruneInput.vue
  • src/views/settings/components/inputComponents/SpecificMultipleSelect.vue
  • src/views/settings/index.vue
  • test/modules/normalizers/wrapUpdatedSettings.test.js
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-182:gitlab-mr-iid-182
git switch gitlab-mr-iid-182

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-182
git switch gitlab-mr-iid-182
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-182
git switch gitlab-mr-iid-182
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-182
git switch develop
git merge --squash gitlab-mr-iid-182
git switch develop
git merge --ff-only gitlab-mr-iid-182
git switch develop
git merge gitlab-mr-iid-182
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
blocked

   
stale
No labels
blocked
stale
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/admin-fe!414
No description provided.