Skip to content
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

Prevent NPE whilst migrating if there is a team request review #19855

Merged

Conversation

zeripath
Copy link
Contributor

A pr.Reviewer may be nil when migrating from Gitea if this is a team
request review.

We do not migrate teams therefore we cannot map these requests, but we can
migrate user requests.

Signed-off-by: Andrew Thornton art27@cantab.net

A pr.Reviewer may be nil when migrating from Gitea if this is a team
request review.

We do not migrate teams therefore we cannot map these requests, but we can
migrate user requests.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added type/bug topic/repo-migration Migrate repos from other platforms to Gitea, or from Gitea to them labels May 31, 2022
@zeripath zeripath added this to the 1.17.0 milestone May 31, 2022
services/migrations/gitea_downloader.go Outdated Show resolved Hide resolved
modules/migration/review.go Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 31, 2022
zeripath and others added 2 commits June 1, 2022 04:03
Co-authored-by: delvh <dev.lh@web.de>
Signed-off-by: Andrew Thornton <art27@cantab.net>
services/migrations/github.go Outdated Show resolved Hide resolved
zeripath added 2 commits June 2, 2022 22:36
Signed-off-by: Andrew Thornton <art27@cantab.net>
@lunny
Copy link
Member

lunny commented Jun 3, 2022

The logic in gitea_uploader needs to be updated since there is a new state of ReviewType.

@zeripath
Copy link
Contributor Author

zeripath commented Jun 3, 2022

I don't think it does?

This works as is.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 5, 2022
services/migrations/gitea_downloader.go Outdated Show resolved Hide resolved
services/migrations/github.go Show resolved Hide resolved
zeripath added 2 commits June 7, 2022 21:46
Signed-off-by: Andrew Thornton <art27@cantab.net>
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 8, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #19855 (c7666d8) into main (73382d2) will decrease coverage by 0.02%.
The diff coverage is 61.31%.

@@            Coverage Diff             @@
##             main   #19855      +/-   ##
==========================================
- Coverage   47.32%   47.30%   -0.03%     
==========================================
  Files         959      962       +3     
  Lines      133652   133882     +230     
==========================================
+ Hits        63252    63334      +82     
- Misses      62699    62833     +134     
- Partials     7701     7715      +14     
Impacted Files Coverage Δ
cmd/admin.go 0.00% <0.00%> (ø)
models/db/engine.go 32.65% <ø> (-0.91%) ⬇️
models/webhook/webhook.go 68.81% <0.00%> (-1.26%) ⬇️
modules/markup/markdown/toc.go 0.00% <0.00%> (ø)
modules/migration/review.go 100.00% <ø> (ø)
modules/repository/init.go 51.92% <0.00%> (ø)
modules/templates/helper.go 45.71% <0.00%> (-4.13%) ⬇️
routers/web/explore/code.go 0.00% <0.00%> (ø)
routers/web/org/setting.go 0.00% <0.00%> (ø)
routers/web/repo/pull.go 31.23% <0.00%> (ø)
... and 76 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d087554...c7666d8. Read the comment docs.

@wxiaoguang wxiaoguang merged commit 7948cb3 into go-gitea:main Jun 9, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 9, 2022
* giteaofficial/main:
  Prevent NPE whilst migrating if there is a team request review (go-gitea#19855)
  [skip ci] Updated translations via Crowdin
  Add support for rendering terminal output with colors (go-gitea#19497)
  Fix viewed images not loading in a PR (go-gitea#19919)
  Remove out-dated comments (go-gitea#19921)
  Automatically render wiki TOC (go-gitea#19873)
  Improve wording on delete access token modal (go-gitea#19909)
  [skip ci] Updated translations via Crowdin
  Add breaking email restrictions checker in doctor (go-gitea#19903)
  Ensure minimum mirror interval is reported on settings page (go-gitea#19895)
  Improve UX on modal for deleting an access token (go-gitea#19894)
  update discord invite (go-gitea#19907)
  Only log non ErrNotExist errors in git.GetNote  (go-gitea#19884)
  [skip ci] Updated translations via Crowdin
  Update frontend guideline (go-gitea#19901)
  Make AppDataPath absolute against the AppWorkPath if it is not (go-gitea#19815)
@zeripath zeripath deleted the prevent-npe-when-migrating-if-reviewer-nil branch June 13, 2022 20:06
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
…tea#19855)

A pr.Reviewer may be nil when migrating from Gitea if this is a team
request review.

We do not migrate teams therefore we cannot map these requests, but we can
migrate user requests.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/repo-migration Migrate repos from other platforms to Gitea, or from Gitea to them type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants