fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests1 Activity

generate-module-options-rebase #1

Open
kiara wants to merge 10 commits from kiara/Fediversity:generate-module-options-rebase into generate-module-options
Conversation 0 Commits 10 Files changed 15 +802 -240
kiara commented 2025-04-06 09:39:07 +02:00
First-time contributor

while the compare page shows everything changed, i wonder if opening a pr from it would show the actual diffs :(

edit: guess not, drat

while the compare page shows everything changed, i wonder if opening a pr from it would show the actual diffs :( edit: guess not, drat
kiara added 13 commits 2025-04-06 09:39:08 +02:00 
closes 
Added a clickable link to the services that deployed.

Reviewed-on: 
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: lois <lois@procolix.eu>
Co-committed-by: lois <lois@procolix.eu>
This reverts commit b9c12db2ed.
This reverts commit f346002ab9.
it's still broken because of the default values, need to look at it more
closely
This pull request has changes conflicting with the target branch.
  • deployment/default.nix
  • deployment/options.nix
  • npins/sources.json
  • panel/default.nix
  • panel/src/panel/tests/test_configuration_form.py
  • panel/src/panel/views.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u https://git.fediversity.eu/kiara/Fediversity generate-module-options-rebase:kiara-generate-module-options-rebase
git checkout kiara-generate-module-options-rebase

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 checkout generate-module-options
git merge --no-ff kiara-generate-module-options-rebase
git checkout kiara-generate-module-options-rebase
git rebase generate-module-options
git checkout generate-module-options
git merge --ff-only kiara-generate-module-options-rebase
git checkout kiara-generate-module-options-rebase
git rebase generate-module-options
git checkout generate-module-options
git merge --no-ff kiara-generate-module-options-rebase
git checkout generate-module-options
git merge --squash kiara-generate-module-options-rebase
git checkout generate-module-options
git merge --ff-only kiara-generate-module-options-rebase
git checkout generate-module-options
git merge kiara-generate-module-options-rebase
git push origin generate-module-options
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
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: fricklerhandwerk/Fediversity#1
No description provided.
Delete branch "kiara/Fediversity:generate-module-options-rebase"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?