Merge of upstream 'release' into G-Node/gogs 'master' #107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
Co-authored-by: Gogs <[email protected]>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
* web: correctly serving go-get page for subdirs * Update CHANGELOG * Fix golint error
Co-authored-by: Zhukov Roman <[email protected]> Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <[email protected]>
achilleas-k
approved these changes
Dec 3, 2020
|
Merging and ignoring linting errors for now. Dav can be cleaned out in a followup PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This large PR merges all of the latest changes from gogs/gogs
release/0.12into the current G-Node/gogsmasterbranch.makeandmake testdid 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:
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. The commit hashes correspond to the commits in their original upstream branch (main or release/0.12).
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/release/0.12branch viagit cherry. Commits with a-sign could be merged cleanly, those with a+sign had merge conflicts. Most of the merge conflicts occurred ingo.mod,go.sumor one of the generated template files or were import issues.