cyberia/capsul-flask
9
6
Fork 8
Code Issues 21 Pull requests 5 Projects Releases Wiki Activity

small fixes during first ever official development environment build-out #43

Open
forest wants to merge 7 commits from development into main
pull from: development
merge into: cyberia:main
Conversation 1 Commits 7 Files changed 6 +110 -10
forest commented 2022-10-07 00:45:53 +00:00
Owner
Copy link
No description provided.
forest added 4 commits 2022-10-07 00:45:55 +00:00
forest commented 2022-10-07 00:46:54 +00:00
Author
Owner
Copy link

I propose expanding this PR so that our prod config is no longer part of the main branch of the capsul repo.

I propose expanding this PR so that our prod config is no longer part of the main branch of the capsul repo.
forest added 2 commits 2022-10-10 18:50:43 +00:00
forest added 1 commit 2022-11-03 16:34:54 +00:00 
It messed up billing information for an account resulting in an epically
massive negative account balance -- every single vm was marked as
existing from its time of creation until the time the account ran out of
funds --  the "deleted" timestamps of many many capsuls were moved far
into the future,  thus dramatically expanding the amount of money billed
for those capsuls
This pull request has changes conflicting with the target branch.
  • capsulflask/hub_api.py
  • docs/deployment.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin development:development
git checkout development

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff development
git checkout main
git merge --ff-only development
git checkout development
git rebase main
git checkout main
git merge --no-ff development
git checkout main
git merge --squash development
git checkout main
git merge --ff-only development
git checkout main
git merge development
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: cyberia/capsul-flask#43
No description provided.
Delete branch "development"

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?