Skip to content

Fix merge dialog on protected branch with missing required statuses #11074

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

Merged

Conversation

6543
Copy link
Member

@6543 6543 commented Apr 14, 2020

It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet.

Fix #10636 by adding case: missing StatusChecks when these are missing

Screenshot at 2020-04-15 13-21-35

Copy link
Member Author

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rm debugg stuff

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 14, 2020
@6543 6543 changed the title Fix merge dialog on protected branch 10636 [Fix] [UI] merge dialog on protected branch 10636 Apr 14, 2020
@codecov-io
Copy link

Codecov Report

Merging #11074 into master will increase coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11074      +/-   ##
==========================================
+ Coverage   43.50%   43.52%   +0.01%     
==========================================
  Files         598      598              
  Lines       84771    84769       -2     
==========================================
+ Hits        36877    36893      +16     
+ Misses      43353    43335      -18     
  Partials     4541     4541              
Impacted Files Coverage Δ
routers/repo/pull.go 34.31% <0.00%> (+0.06%) ⬆️
modules/indexer/stats/queue.go 62.50% <0.00%> (-18.75%) ⬇️
modules/indexer/stats/db.go 40.62% <0.00%> (-9.38%) ⬇️
modules/queue/workerpool.go 58.00% <0.00%> (+1.06%) ⬆️
services/gitdiff/gitdiff.go 74.43% <0.00%> (+1.85%) ⬆️
modules/queue/unique_queue_disk_channel.go 55.76% <0.00%> (+1.92%) ⬆️
modules/charset/charset.go 72.82% <0.00%> (+3.26%) ⬆️
services/pull/temp_repo.go 37.60% <0.00%> (+3.41%) ⬆️

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 d66b9a4...f24fc6b. 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 Apr 15, 2020
@lafriks lafriks added this to the 1.12.0 milestone Apr 15, 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 Apr 15, 2020
@6543 6543 changed the title [Fix] [UI] merge dialog on protected branch 10636 [Fix] [UI] merge dialog on protected branch Apr 15, 2020
@zeripath zeripath changed the title [Fix] [UI] merge dialog on protected branch Fix merge dialog on protected branch with missing required statuses Apr 15, 2020
@zeripath
Copy link
Contributor

Make lg-tm work

@zeripath zeripath merged commit a88f366 into go-gitea:master Apr 15, 2020
@6543 6543 deleted the fix-mergedialog-on-protected-branch_10636 branch April 15, 2020 22:33
6543 added a commit to 6543-forks/gitea that referenced this pull request Apr 15, 2020
…o-gitea#11074)

It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet.

Fix go-gitea#10636 by adding case: missing StatusChecks when these are missing
@6543
Copy link
Member Author

6543 commented Apr 15, 2020

Backport send #11084

@lafriks lafriks added the backport/done All backports for this PR have been created label Apr 16, 2020
lafriks pushed a commit that referenced this pull request Apr 16, 2020
…11074) (#11084)

It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet.

Fix #10636 by adding case: missing StatusChecks when these are missing
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
…o-gitea#11074)

It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet.

Fix go-gitea#10636 by adding case: missing StatusChecks when these are missing
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: protected branch: pull check
6 participants