Merge upstream/main into feat/google-groups-retrieving

Resolve import-path conflicts after gitea.dev rename while keeping
OAuth2 required-additional-info admin banner hooks.

Assisted-by: Cursor:Composer
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Andy Mrichko
2026-06-02 22:34:50 +03:00
co-authored by Cursor
2830 changed files with 34427 additions and 21993 deletions
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"net/http"
"net/url"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"gitea.dev/modules/json"
"gitea.dev/modules/log"
"github.com/markbates/goth"
)