forks/forgejo
1
0
Fork 0
Code Releases Activity
forgejo/services
History
zeripath 4199d28053
When updating by rebase we need to set the environment for head repo (#22535) 
The update by rebase code reuses the merge code but shortcircuits and
pushes back up to the head. However, it doesn't set the correct pushing
environment - and just uses the same environment as the base repo. This
leads to the push update failing and thence the PR becomes out-of-sync
with the head.

This PR fixes this and adjusts the trace logging elsewhere to help make
this clearer.

Fix #18802

Signed-off-by: Andrew Thornton <art27@cantab.net>

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2023-01-19 17:31:44 -05:00
..
agit Rename almost all Ctx functions (#22071) 2022-12-10 10:46:31 +08:00
asymkey Supports wildcard protected branch (#20825) 2023-01-16 16:00:22 +08:00
attachment Add API management for issue/pull and comment attachments (#21783) 2022-12-09 14:35:56 +08:00
auth Support scoped access tokens (#20908) 2023-01-17 15:46:03 -06:00
automerge refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
context Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
convert Fix pull request API field closed_at always being null (#22482) 2023-01-17 11:42:32 +00:00
cron Add cron method to gc LFS MetaObjects (#22385) 2023-01-16 13:50:53 -06:00
externalaccount Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
forms Support scoped access tokens (#20908) 2023-01-17 15:46:03 -06:00
gitdiff Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue Fix issue not auto-closing when it includes a reference to a branch (#22514) 2023-01-18 19:24:38 -05:00
lfs Use context parameter in models/git (#22367) 2023-01-09 11:50:54 +08:00
mailer Add reply hint to mail text (#22459) 2023-01-16 14:58:01 -06:00
markup Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
migrations Fix assignment to cm.AssigneeID when importing comments (#22528) 2023-01-19 13:24:40 -05:00
mirror Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
org Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
packages Display unreferenced packages total size in package admin panel (#22498) 2023-01-18 09:52:04 -06:00
pull When updating by rebase we need to set the environment for head repo (#22535) 2023-01-19 17:31:44 -05:00
release Add API management for issue/pull and comment attachments (#21783) 2022-12-09 14:35:56 +08:00
repository When updating by rebase we need to set the environment for head repo (#22535) 2023-01-19 17:31:44 -05:00
task Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
user Unify hashing for avatar (#22289) 2023-01-02 22:46:39 +01:00
webhook fix: omit avatar_url in discord payload when empty (#22393) 2023-01-10 14:01:52 -05:00
wiki Improve utils of slices (#22379) 2023-01-11 13:31:16 +08:00