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

Issue comment reactions should also check pull type #13349

Merged

Conversation

zeripath
Copy link
Contributor

Unfortunately my final push to #13344 didn't register - or I failed to push it properly. GetIssueCommentReactions in routers/api/v1/repo/issue_reaction.go also makes the same mistake.

This PR fixes this.

A failure during migrating reactions should not cause failure of
migration.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.14.0 milestone Oct 29, 2020
zeripath added a commit to techknowlogick/gitea that referenced this pull request Oct 29, 2020
Unfortunately my final push to go-gitea#13344 didn't register - or I failed to push it properly. GetIssueCommentReactions in routers/api/v1/repo/issue_reaction.go also makes the same mistake.
@zeripath
Copy link
Contributor Author

zeripath commented Oct 29, 2020

I've added this to #13346 and created its backport as #13350

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 29, 2020
@zeripath zeripath added the backport/done All backports for this PR have been created label Oct 29, 2020
@codecov-io
Copy link

Codecov Report

Merging #13349 into master will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13349      +/-   ##
==========================================
- Coverage   42.12%   42.11%   -0.01%     
==========================================
  Files         689      689              
  Lines       75851    75853       +2     
==========================================
  Hits        31949    31949              
  Misses      38670    38670              
- Partials     5232     5234       +2     
Impacted Files Coverage Δ
routers/api/v1/repo/issue_reaction.go 46.76% <0.00%> (-0.69%) ⬇️
modules/indexer/stats/db.go 52.17% <0.00%> (-8.70%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/queue/workerpool.go 60.00% <0.00%> (-2.05%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
modules/git/repo.go 46.19% <0.00%> (-0.51%) ⬇️
modules/log/file.go 75.20% <0.00%> (+1.60%) ⬆️
services/pull/patch.go 55.68% <0.00%> (+1.70%) ⬆️
services/pull/check.go 51.82% <0.00%> (+2.91%) ⬆️
services/pull/temp_repo.go 29.78% <0.00%> (+3.19%) ⬆️

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 4b33afc...16b5e65. Read the comment docs.

@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 Oct 29, 2020
@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 Oct 29, 2020
@lunny lunny merged commit 55801cf into go-gitea:master Oct 29, 2020
@zeripath zeripath deleted the migrating-reactions-is-just-not-important branch October 29, 2020 13:34
techknowlogick added a commit that referenced this pull request Oct 29, 2020
* Migration failure during reaction migration from gitea (#13344)

* Migrating reactions is just not that important

A failure during migrating reactions should not cause failure of
migration.

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

* When checking issue reactions check the correct permission

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

Co-authored-by: techknowlogick <techknowlogick@gitea.io>

* Delete gitea_downloader.go

* Backport #13349

Unfortunately my final push to #13344 didn't register - or I failed to push it properly. GetIssueCommentReactions in routers/api/v1/repo/issue_reaction.go also makes the same mistake.

Co-authored-by: zeripath <art27@cantab.net>
@6543 6543 added modifies/api This PR adds API routes or modifies them skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Nov 10, 2020
@6543
Copy link
Member

6543 commented Nov 10, 2020

skip changelog because it is included in unreleased 1.13.0

@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants