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

Fetch list of tabs and use it to render menu in the Settings section #434

Open
linafilippova wants to merge 1 commit from gitlab-mr-iid-202 into develop
pull from: gitlab-mr-iid-202
merge into: pleroma:develop
Conversation 0 Commits 1 Files changed 3 +3 -35
linafilippova commented 2021-03-19 17:33:49 +00:00
Member
Copy link

This MR complements #427 and should be merged after pleroma/pleroma#6725 is merged

Blocked by pleroma!3348

This MR complements https://git.pleroma.social/pleroma/admin-fe/pulls/427 and should be merged after https://git.pleroma.social/pleroma/pleroma/pulls/6725 is merged Blocked by pleroma!3348
This pull request has changes conflicting with the target branch.
  • src/utils/tabs.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-202:gitlab-mr-iid-202
git switch gitlab-mr-iid-202

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-202
git switch gitlab-mr-iid-202
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-202
git switch gitlab-mr-iid-202
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-202
git switch develop
git merge --squash gitlab-mr-iid-202
git switch develop
git merge --ff-only gitlab-mr-iid-202
git switch develop
git merge gitlab-mr-iid-202
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
1 participant
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!434
No description provided.