You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by sh...@apache.org on 2023/11/29 08:23:36 UTC

(incubator-answer) 01/01: fix: resolve conflict lock file

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

shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git

commit 619149f37c87309a64473afe04e55a9dfe10d282
Merge: 8ddaba85 1a76d0aa
Author: shuai <li...@sifou.com>
AuthorDate: Wed Nov 29 16:23:24 2023 +0800

    fix: resolve conflict lock file

 .asf.yaml                                          |   2 +-
 ...goreleaser.yml => build-binary-for-release.yml} |   4 +-
 ...manual_build.yml => build-image-for-manual.yml} |  29 +-
 ...ckerhub_img.yml => build-image-for-release.yml} |  12 +-
 ...{build_dev_img.yml => build-image-for-test.yml} |  37 +-
 .github/workflows/{ci.yml => check-asf-header.yml} |   2 +-
 .goreleaser.yaml                                   |  15 +-
 Dockerfile                                         |   2 +-
 Makefile                                           |   4 +
 README.md                                          |  23 +-
 README_CN.md                                       |  39 ---
 SECURITY.md                                        |   7 -
 charts/templates/_helpers.tpl                      |  19 +-
 charts/templates/hpa.yaml                          |   2 +-
 charts/templates/ingress.yaml                      |   2 +-
 charts/templates/pvc.yaml                          |   2 +-
 charts/templates/serviceaccount.yaml               |   2 +-
 docs/release/LICENSE                               | 314 +++++++++++++++++
 docs/release/NOTICE                                |   5 +
 .../licenses/LICENSE-Chain-Zhang-pinyin.txt        |  21 ++
 .../licenses/LICENSE-JedWatson-classnames.txt      |  21 ++
 docs/release/licenses/LICENSE-Machiel-slugify.txt  |  22 ++
 .../licenses/LICENSE-Masterminds-semver.txt        |  19 ++
 docs/release/licenses/LICENSE-Qix--color.txt       |  20 ++
 .../release/licenses/LICENSE-anargu-gin-brotli.txt |  21 ++
 .../licenses/LICENSE-asaskevich-govalidator.txt    |  21 ++
 docs/release/licenses/LICENSE-axios-axios.txt      |   7 +
 .../licenses/LICENSE-bwmarrin-snowflake.txt        |  23 ++
 .../licenses/LICENSE-codemirror-codemirror5.txt    |  21 ++
 docs/release/licenses/LICENSE-cznic-sqlite.txt     |  26 ++
 .../licenses/LICENSE-disintegration-imaging.txt    |  21 ++
 docs/release/licenses/LICENSE-facebook-react.txt   |  21 ++
 docs/release/licenses/LICENSE-gin-gonic-gin.txt    |  21 ++
 docs/release/licenses/LICENSE-go-gomail-gomail.txt |  20 ++
 .../licenses/LICENSE-go-playground-locales.txt     |  21 ++
 .../LICENSE-go-playground-universal-translator.txt |  21 ++
 .../licenses/LICENSE-go-playground-validator.txt   |  22 ++
 .../licenses/LICENSE-go-sql-driver-mysql.txt       | 373 +++++++++++++++++++++
 docs/release/licenses/LICENSE-go-yaml-yaml.txt     |  50 +++
 docs/release/licenses/LICENSE-goccy-go-json.txt    |  21 ++
 docs/release/licenses/LICENSE-golang-mock.txt      | 202 +++++++++++
 docs/release/licenses/LICENSE-golang-org-x.txt     |  27 ++
 docs/release/licenses/LICENSE-google-uuid.txt      |  27 ++
 docs/release/licenses/LICENSE-google-wire.txt      | 202 +++++++++++
 .../LICENSE-grokify-html-strip-tags-go.txt         |  27 ++
 docs/release/licenses/LICENSE-i18next-i18next.txt  |  21 ++
 .../licenses/LICENSE-i18next-react-i18next.txt     |  21 ++
 docs/release/licenses/LICENSE-iamkun-dayjs.txt     |  21 ++
 docs/release/licenses/LICENSE-jinzhu-copier.txt    |  20 ++
 docs/release/licenses/LICENSE-jinzhu-now.txt       |  21 ++
 .../licenses/LICENSE-jordan-wright-email.txt       |  20 ++
 docs/release/licenses/LICENSE-kpdecker-jsdiff.txt  |  31 ++
 docs/release/licenses/LICENSE-lib-pq.txt           |   8 +
 docs/release/licenses/LICENSE-ljharb-qs.txt        |  29 ++
 docs/release/licenses/LICENSE-lodash-lodash.txt    |  49 +++
 docs/release/licenses/LICENSE-markedjs-marked.txt  |  44 +++
 docs/release/licenses/LICENSE-mattn-go-sqlite3.txt |  21 ++
 .../licenses/LICENSE-microcosm-cc-bluemonday.txt   |  31 ++
 .../licenses/LICENSE-mojocn-base64Captcha.txt      |  13 +
 docs/release/licenses/LICENSE-npm-node-semver.txt  |  15 +
 docs/release/licenses/LICENSE-ory-dockertest.txt   | 201 +++++++++++
 docs/release/licenses/LICENSE-pmndrs-zustand.txt   |  21 ++
 docs/release/licenses/LICENSE-pvorb-node-md5.txt   |  27 ++
 .../LICENSE-react-bootstrap-react-bootstrap.txt    |  21 ++
 .../licenses/LICENSE-remix-run-react-router.txt    |   9 +
 docs/release/licenses/LICENSE-robfig-cron.txt      |  21 ++
 .../LICENSE-scottleedavis-go-exif-remove.txt       |  21 ++
 .../licenses/LICENSE-segmentfault-pacman.txt       |  21 ++
 docs/release/licenses/LICENSE-soldair-qrcode.txt   |   9 +
 docs/release/licenses/LICENSE-spf13-cobra.txt      | 174 ++++++++++
 .../LICENSE-staylor-react-helmet-async.txt         | 201 +++++++++++
 docs/release/licenses/LICENSE-stretchr-testify.txt |  21 ++
 .../LICENSE-sudodoki-copy-to-clipboard.txt         |  21 ++
 docs/release/licenses/LICENSE-swaggo-files.txt     |  21 ++
 .../licenses/LICENSE-swaggo-gin-swagger.txt        |  21 ++
 docs/release/licenses/LICENSE-swaggo-swag.txt      |  21 ++
 docs/release/licenses/LICENSE-tidwall-gjson.txt    |  20 ++
 docs/release/licenses/LICENSE-twbs-bootstrap.txt   |  21 ++
 docs/release/licenses/LICENSE-twbs-icons.txt       |  21 ++
 docs/release/licenses/LICENSE-vercel-swr.txt       |  21 ++
 docs/release/licenses/LICENSE-xorm.txt             |  27 ++
 docs/release/licenses/LICENSE-yuin-goldmark.txt    |  21 ++
 .../licenses/LIcENSE-Bunlong-next-share.txt        |   9 +
 i18n/en_US.yaml                                    |   3 +
 internal/controller/template_controller.go         |   2 +-
 internal/service/mock/siteinfo_repo_mock.go        | 216 ++++++++++++
 licenserc.toml                                     |  18 +
 .../build_test.yml => script/check-asf-header.sh   |  45 +--
 ui/src/pages/Questions/Ask/index.tsx               |   5 +-
 ui/src/pages/Questions/EditAnswer/index.tsx        |   5 +-
 .../pages/Search/components/SearchItem/index.tsx   |   5 +-
 ui/src/pages/Tags/Edit/index.tsx                   |   5 +-
 .../Users/Personal/components/Answers/index.tsx    |   7 +-
 .../Users/Personal/components/Comments/index.tsx   |   7 +-
 .../Personal/components/DefaultList/index.tsx      |   7 +-
 .../Users/Personal/components/Reputation/index.tsx |   7 +-
 .../Users/Personal/components/TopList/index.tsx    |   7 +-
 .../Users/Personal/components/Votes/index.tsx      |   7 +-
 ui/src/router/routes.ts                            |   3 +
 ui/src/utils/guard.ts                              |  19 ++
 ui/template/header.html                            |  44 ++-
 ui/template/page.html                              |   1 -
 ui/template/question-detail.html                   |   1 -
 ui/template/{sitemap-list.xml => sidenav.html}     |  29 +-
 ui/template/sitemap-list.xml                       |   4 +-
 ui/template/sitemap.xml                            |   4 +-
 ui/template/tags.html                              |   2 +-
 107 files changed, 3391 insertions(+), 218 deletions(-)