This is an automated email from the ASF dual-hosted git repository.

LinkinStars pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/answer.git

commit ecef4f11dce25b7785cfad41baccc12da030cbb5
Merge: 9df58539 3b9f1370
Author: LinkinStars <[email protected]>
AuthorDate: Wed Jul 29 17:19:20 2026 +0800

    Merge remote-tracking branch 'origin/main' into dev
    
    # Conflicts:
    #       docs/release/LICENSE
    #       internal/service/notification/new_question_notification_test.go

 .../workflows/build-image-for-latest-release.yml   |  41 ++++---
 .github/workflows/build-image-for-manual.yml       |  42 ++++----
 .github/workflows/build-image-for-release.yml      |  44 ++++----
 .github/workflows/build-image-for-test.yml         |  41 +++----
 Dockerfile                                         |   2 +-
 Makefile                                           |   2 +-
 README.md                                          |   2 +-
 cmd/wire_gen.go                                    |   2 +-
 docs/release/LICENSE                               |   1 +
 go.mod                                             |  14 +--
 go.sum                                             |  32 +++---
 internal/base/constant/cache_key.go                |   3 +
 internal/base/middleware/accept_language.go        |   6 ++
 internal/base/queue/queue.go                       |   6 +-
 internal/base/queue/queue_test.go                  |   6 +-
 internal/controller/connector_controller.go        |  66 +++++++++++-
 internal/controller/mcp_controller.go              |   6 ++
 internal/controller/template_render/tags.go        |   3 +-
 internal/controller/template_render/userinfo.go    |   3 +-
 internal/repo/answer/answer_repo.go                |   8 +-
 internal/repo/api_key/api_key_repo.go              |   8 ++
 internal/repo/tag/tag_rel_repo.go                  |   1 +
 .../user_external_login_repo.go                    |  26 +++++
 internal/schema/user_external_login_schema.go      |  12 +++
 internal/service/apikey/apikey_service.go          |   5 +
 internal/service/content/answer_service.go         |   6 ++
 internal/service/content/question_service.go       |   2 +-
 internal/service/content/revision_service.go       |  48 +++++----
 internal/service/content/user_service.go           |  10 +-
 internal/service/export/email_service.go           |   2 +-
 .../notification/new_question_notification_test.go |  15 +++
 internal/service/report/report_service.go          |   2 +-
 internal/service/user_admin/user_backyard.go       |  16 +++
 .../user_external_login_service.go                 | 120 +++++++++++++++++----
 34 files changed, 421 insertions(+), 182 deletions(-)

Reply via email to