mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-19 21:12:44 +02:00
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:
@@ -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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user