3wordchant
/
capsul-flask
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

cyberia-prod #14

Open
forest wants to merge 12 commits from cyberia-prod into master
pull from: cyberia-prod
merge into: 3wordchant:master
Conversation 0 Commits 12 Files Changed 12 +117 -21
forest commented 2021-09-02 17:03:55 +00:00
Collaborator
Copy Link

no pressure on merging this, just adding the changes that we have done to support our stuff.

no pressure on merging this, just adding the changes that we have done to support our stuff.
forest added 12 commits 2021-09-02 17:03:56 +00:00
This pull request has changes conflicting with the target branch.
  • capsulflask/templates/support.html
  • capsulflask/__init__.py
  • capsulflask/cli.py
  • capsulflask/db.py
  • capsulflask/payment.py
  • capsulflask/schema_migrations/19_down_os_updates.sql
  • capsulflask/schema_migrations/19_up_os_updates.sql
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b cyberia-prod master
git pull origin cyberia-prod

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff cyberia-prod
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 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: 3wordchant/capsul-flask#14
No description provided.
Delete Branch "cyberia-prod"

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?