Soper
/
sugoi
forked from gitbot/uguu
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WIP: updating to match uguu #1

Draft
Soper wants to merge 51 commits from gitbot:master into master
pull from: gitbot:master
merge into: Soper:master
Conversation 0 Commits 51 Files Changed 50
Soper commented 2022-06-12 09:00:26 +00:00
Owner
There is no content yet.
Soper added 51 commits 2022-06-12 09:00:27 +00:00
3465b5926e file ext fix 
lets just ignore double dots :)
b3c0237ad9 docker support added 
using alpine for the docker instead of ubuntu cuts the size and installation time by quite a bit
Soper started working 2022-06-12 09:00:45 +00:00
Soper cancelled time tracking 2022-06-12 09:00:47 +00:00
Soper closed this pull request 2022-06-12 09:10:37 +00:00
Soper reopened this pull request 2022-06-12 09:10:52 +00:00
Soper closed this pull request 2022-06-12 09:11:28 +00:00
Soper reopened this pull request 2022-06-12 10:16:51 +00:00
This pull request has changes conflicting with the target branch.
  • static/php/grill.php
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 gitbot-master master
git pull master

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff gitbot-master
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
Projects
Clear projects
No project
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: Soper/sugoi#1
There is no content yet.
Delete Branch "gitbot:master"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?