-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge of upstream 'main' into G-Node/gogs 'gogs-picked' #106
Conversation
The commit message should not be treated as locale at all.
* Fix import path renaming * api: overhaul /repos/owner/repos/contents
* ci: enable go vet check * Improve .travis.yml
This PR groups the contents api endpoint with both `""` and `/*` as valid URL patterns. When `""` is the URL pattern, this means that no repo path has'nt been provided, in which case the path would be the default repo path. When `"/*"` is the URL pattern, then this would return the contents at the specified path if it's valid. Github API v3 is conformant to this behavior and have verified it locally.
* email: check the owner when set as primary Fixes a security issue reported by muxishuihan. * Update CHANGELOG
* ipynb: sanitize rendered HTML Fixes #5170 * Remove hardcode URL * Add tests
* admin: use POST to run operations Fixed CSRF reported by Wenxu Wu of Tencent's Xuanwu Lab. * Update CHANGELOG
* Create golint.yml * Update golint.yml * Update golint.yml * Fix errcheck * Fix gosimple * Fix staticcheck
* Overual route handlers and fixes #5366 * Merge routes for repo and org * Inject OrgRepoContext * DRY validateWebhook * DRY c.HasError * Add tests * Update CHANGELOG
* Update golint.yml * Update lsif.yml
*Total -- 13.23kb -> 10.21kb (22.85%) /public/img/dingtalk.png -- 7.86kb -> 5.96kb (24.1%) /public/img/slack.png -- 5.38kb -> 4.25kb (21.02%) Signed-off-by: ImgBotApp <[email protected]> Co-authored-by: ImgBotApp <[email protected]>
* cmd: backup support exclude mirror repositories * Apply suggestions from code review Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Bumps [github.com/google/go-cmp](https://github.com/google/go-cmp) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/google/go-cmp/releases) - [Commits](google/go-cmp@v0.3.0...v0.4.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [gopkg.in/ini.v1](https://github.com/go-ini/ini) from 1.60.2 to 1.62.0. - [Release notes](https://github.com/go-ini/ini/releases) - [Commits](go-ini/ini@v1.60.2...v1.62.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [github.com/gogs/git-module](https://github.com/gogs/git-module) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/gogs/git-module/releases) - [Commits](gogs/git-module@v1.1.3...v1.1.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
….8.0 (#6394) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.6.0 to 1.8.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/master/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.6.0...v1.8.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [gorm.io/driver/sqlserver](https://github.com/go-gorm/sqlserver) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/go-gorm/sqlserver/releases) - [Commits](go-gorm/sqlserver@v1.0.4...v1.0.5) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [gorm.io/driver/mysql](https://github.com/go-gorm/mysql) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/go-gorm/mysql/releases) - [Commits](go-gorm/mysql@v1.0.2...v1.0.3) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.3 to 0.3.4. - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.3.3...v0.3.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [github.com/urfave/cli](https://github.com/urfave/cli) from 1.22.4 to 1.22.5. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/master/docs/CHANGELOG.md) - [Commits](urfave/cli@v1.22.4...v1.22.5) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.20.5 to 1.20.6. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](go-gorm/gorm@v1.20.5...v1.20.6) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [gopkg.in/macaron.v1](https://github.com/go-macaron/macaron) from 1.3.9 to 1.4.0. - [Release notes](https://github.com/go-macaron/macaron/releases) - [Commits](go-macaron/macaron@v1.3.9...v1.4.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
innodb_file_format and innodb_large_prefix have been deprecated with MariaDB v10.2 and removed with v10.3.1. They have been reintroduced with v10.4.3 but remain deprecated and unused: - https://mariadb.com/kb/en/innodb-system-variables/#innodb_file_format - https://mariadb.com/kb/en/innodb-system-variables/#innodb_large_prefix Setting those variables on MariaDB >=10.3.1 leads to the following error: "ERROR 1238 (HY000) at line 7: Variable 'innodb_file_format' is a read only variable" Since semantic versioning patch versions cannot be compared via numeric operators, only the major + minor versions are compared against 10.3. Since v10.2.2 the defaults match the desired values, so there is only the single patch version 10.3.0 where, when explicitly set differently via MariaDB configs, this commit could lead to an unwanted database format. In favour of a simple SQL change, this case is ignored. This commit additionally removes trailing spaces and the doubled trailing empty line. Signed-off-by: MichaIng <[email protected]>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
…1 (#6431) Bumps [github.com/Masterminds/semver/v3](https://github.com/Masterminds/semver) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/Masterminds/semver/releases) - [Changelog](https://github.com/Masterminds/semver/blob/master/CHANGELOG.md) - [Commits](Masterminds/semver@v3.1.0...v3.1.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
… (#6429) Bumps [github.com/russross/blackfriday](https://github.com/russross/blackfriday) from 1.5.2 to 1.6.0. - [Release notes](https://github.com/russross/blackfriday/releases) - [Commits](russross/blackfriday@v1.5.2...v1.6.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
* build(deps): bump gorm.io/gorm from 1.20.6 to 1.20.7 Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.20.6 to 1.20.7. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](go-gorm/gorm@v1.20.6...v1.20.7) Signed-off-by: dependabot-preview[bot] <[email protected]> * Fix compile error Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Bumps [gorm.io/driver/sqlite](https://github.com/go-gorm/sqlite) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/go-gorm/sqlite/releases) - [Commits](go-gorm/sqlite@v1.1.3...v1.1.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
We should probably merge this, right? |
No, we already merged a later PR that contains most of the changes here. I think we kept this one for reference once a new release of gogs was available and create another PR from there. |
Right. Thanks for refreshing my memory. yeah, I think we should close it. It'll still be around if we need it. |
This large PR merges all of the latest changes from gogs/gogs
main
into the current G-Node/gogsgogs-picked
branch. All commits where cherry picked and any merge conflicts resolved and the base ´make´ andmake test
did run successfully.Potentially breaking changes
During the full list of merges most of the merge conflicts were minor and should not cause any issues. The following list were upstream changes that caused merge issues and require serious testing since they change core concepts of the service:
IsUnlisted
while in the GIN database the field is calledUnlisted
and needs to be migrated.internal/cmd/serv.go
was affected by this change and needs to be tested; (same ininternal/dav/middle.go
)public/js/gogs.js
.The following list documents merge conflicts that clashed with custom GIN code but should not cause any serious issues with the service and should be checked on a deployed service.
template/repo/home.tmpl
manual fix application to keep GIN specific contentmain
(#6285)Cherry pick list and status
The following is a list of all cherry picked commits as compared from the current status compared to the
gogs/main
branch viagit cherry
. Commits with a+
sign could be merged cleanly, those with a-
sign had merge commits. Most of the merge commits had merge conflicts ingo.mod
,go.sum
or one of the generated template files or were import issues.