hazaar/hazaar-warlock
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases 4 Packages Wiki Activity Actions

WIP: Resolve "RESTful triggers" #97

Draft
jamie wants to merge 5 commits from 58-restful-triggers into master
pull from: 58-restful-triggers
merge into: hazaar:master
Conversation 5 Commits 5 Files changed 3 +83 -20
jamie commented 2020-06-06 09:52:12 +00:00 (Migrated from git.hazaar.io)
Copy link

Closes #58

Closes #58
jamie commented 2020-06-06 09:54:21 +00:00 (Migrated from git.hazaar.io)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>fc8590b0 - Fixed mkdir on startup</li><li>497ed371 - Added a very basic RESTful trigger</li></ul> [Compare with previous version](/hazaar/hazaar-warlock/-/merge_requests/30/diffs?diff_id=1461&start_sha=a63a8fafa7d4b100c31dabc74f16c5dcaadd409a)
jamie commented 2020-06-07 04:50:33 +00:00 (Migrated from git.hazaar.io)
Copy link

added 1 commit

  • 737fe64a - Tidied up the new Warlock view triggerURL method

Compare with previous version

added 1 commit <ul><li>737fe64a - Tidied up the new Warlock view triggerURL method</li></ul> [Compare with previous version](/hazaar/hazaar-warlock/-/merge_requests/30/diffs?diff_id=1462&start_sha=497ed371f973c7353e2d620aab2fd493073030b5)
jamie commented 2020-06-07 07:55:17 +00:00 (Migrated from git.hazaar.io)
Copy link

added 1 commit

  • af5e76ec - HTTP processing moved to the client

Compare with previous version

added 1 commit <ul><li>af5e76ec - HTTP processing moved to the client</li></ul> [Compare with previous version](/hazaar/hazaar-warlock/-/merge_requests/30/diffs?diff_id=1463&start_sha=737fe64aa9c814a2c60f69a89a08d9e4c899190a)
jamie commented 2020-06-07 08:01:42 +00:00 (Migrated from git.hazaar.io)
Copy link

added 1 commit

  • 1b46995b - HTTP processing moved to the client

Compare with previous version

added 1 commit <ul><li>1b46995b - HTTP processing moved to the client</li></ul> [Compare with previous version](/hazaar/hazaar-warlock/-/merge_requests/30/diffs?diff_id=1464&start_sha=af5e76ecf65b7d194a56bd51c1f16690287d9e8c)
jamie commented 2021-04-06 01:45:28 +00:00 (Migrated from git.hazaar.io)
Copy link

added 18 commits

  • 1b46995b...5d7e8b0d - 17 commits from branch master
  • f77e4757 - Merge branch 'master' into 58-restful-triggers

Compare with previous version

added 18 commits <ul><li>1b46995b...5d7e8b0d - 17 commits from branch <code>master</code></li><li>f77e4757 - Merge branch &#39;master&#39; into 58-restful-triggers</li></ul> [Compare with previous version](/hazaar/hazaar-warlock/-/merge_requests/30/diffs?diff_id=1899&start_sha=1b46995bc809be9733acf9d4a6e649de51e35bee)
This pull request has changes conflicting with the target branch.
  • src/Server/Client.php
  • src/View/Helper/Warlock.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 58-restful-triggers:58-restful-triggers
git switch 58-restful-triggers

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 master
git merge --no-ff 58-restful-triggers
git switch 58-restful-triggers
git rebase master
git switch master
git merge --ff-only 58-restful-triggers
git switch 58-restful-triggers
git rebase master
git switch master
git merge --no-ff 58-restful-triggers
git switch master
git merge --squash 58-restful-triggers
git switch master
git merge --ff-only 58-restful-triggers
git switch master
git merge 58-restful-triggers
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
confirmed

   
critical

   
discussion

   
documentation

   
Doing

   
enhancement

   
suggestion

   
support

   
To Do
No labels
bug
confirmed
critical
discussion
documentation
Doing
enhancement
suggestion
support
To Do
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: hazaar/hazaar-warlock#97
No description provided.
Delete branch "58-restful-triggers"

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?