ebe569a2Set correct PR status on 3way on conflict checking (#19457)
* Set correct PR status on 3way on conflict checking
- When 3-way merge is enabled for conflict checking, it has a new
interesting behavior that it doesn't return any error when it found a
conflict, so we change the condition to not check for the error, but
instead check if conflictedfiles is populated, this fixes a issue
whereby PR status wasn't correctly on conflicted PR's.
- Refactor the mergeable property(which was incorrectly set and lead me this
bug) to be more maintainable.
- Add a dedicated test for conflicting checking, so it should prevent
future issues with this.
* Fix linterGusted
authored at
GitHub
comitted at
3ec1b6c2Fix logging of Transfer API (#19456)
- Use the correct fullname's in tracing calls.
- Return correct function name in error.
Co-authored-by: 6543 <6543@obermui.de>Gusted
authored at
GitHub
comitted at
c7643556RepoAssignment ensure to close before overwrite (#19449)
* check if GitRepo already open and close if
* only run RepoAssignment once
* refactor context helper for api to open GitRepo6543
authored at
GitHub
comitted at
f4c1aa75Fix DELETE request for non-existent public key (#19443)
- Add a return for the first "block" of errors, which fixes the double
error messages.
- Add a return for `externallyManaged`.
- Resolves #19398Gusted
authored at
GitHub
comitted at
23d37673Don't panic on `ErrEmailInvalid` (#19441)
- Don't panic on `ErrEmailInvalid`, this was caused due that we were
trying to force `ErrEmailCharIsNotSupported` interface, which panics.
- Resolves #19397Gusted
authored at
GitHub
comitted at
1e319ba4When dumping trim the standard suffices instead of a random suffix (#19440)
* When dumping trim the standard suffices instead of a random suffix
Instead of using the `path.Ext()` to trim the last "extension" suffix, just iterate
through the supported suffices and trim those.
Fix #19424
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fix enum with to have correct supported types only
Co-authored-by: 6543 <6543@obermui.de>zeripath
authored at
GitHub
comitted at
a7f0ce62Add uploadpack.allowAnySHA1InWant to allow --filter=blob:none with older git clients (#19430)
Older git clients need uploadpack.allowAnySHA1InWant if partial cloning is allowed.
Fix #19118
Signed-off-by: Andrew Thornton <art27@cantab.net>zeripath
authored at
GitHub
comitted at
5e68fe7dDon't allow merging PR's which are being conflict checked (#19357)
* Don't allow merging PR's which are being conflict checked
- When a PR is still being conflict checked, don't allow the PR to be
merged(the merge button could already be visible before e.g. a new
commit was pushed to the PR).
- Relevant(should prevent such issue from happening) #19352
Co-authored-by: delvh <dev.lh@web.de>Gusted
authored at
GitHub
comitted at
f2229e05doc: add brief intro on using traefik as reverse-proxy (#19432)
Campbell He
authored at
GitHub
comitted at
ae6a5244Fix panic in team repos API (#19431)
* Fix panic in team repos API
* Fix pagination
* fmtqwerty287
authored at
GitHub
comitted at
409ff55aWhen updating mirror repo intervals by API reschedule next update too (#19429)
When a mirror repo interval is updated by the UI it is rescheduled with that interval
however the API does not do this. The API also lacks the enable_prune option.
This PR adds this functionality in to the API Edit Repo endpoint.
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
authored at
GitHub
comitted at
a56fcdfaFix nil error when some pages are rendered outside request context (#19427)
wxiaoguang
authored at
GitHub
comitted at
4396d0e7Note where frontend files are located in docs (#19379)
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>ktprograms
authored at
GitHub
comitted at
f029b9aeDocument 409 error returned by repos/migrate api (#19376)
* Document 409 error returned by repos/migrate api
* Generate swagger spec
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>Chongyi Zheng
authored at
GitHub
comitted at
0d3d9675Fix middleware function's placements for some `/user/...` (#19377)
- Add reqSignIn to `/user/task/{task}` as it specific to a logged in user currently not-logged in user could cause a NPE.
- Move `/user/stopwatch` & `/user/search` middleware before the actual function is called, because functions are executed in order and currently hadn't any effect and could as well cause a NPE due to that.
- Remove `/user/active` reqSignIn middleware, because when you want to active a account you're not "signed in" so it doesn't make sense to add that middleware.Gusted
authored at
GitHub
comitted at
d139c239Fix panic in teams API when requesting members (#19360)
delvh
authored at
GitHub
comitted at
ee769f74Add logic to switch between source/rendered on Markdown (#19356)
Adds a button to switch between the source blob and the rendered markdown.Gusted
authored at
GitHub
comitted at