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.

Sign up for GitHub

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

Jump to bottom

Ignore FindRecentlyPushedNewBranches err #31164

Merged
merged 3 commits into from
May 30, 2024
Merged

Ignore FindRecentlyPushedNewBranches err #31164

merged 3 commits into from
May 30, 2024

Conversation

wxiaoguang
Copy link
Contributor

Fix #31163

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 29, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 29, 2024
@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 29, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 29, 2024
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 29, 2024
@wxiaoguang wxiaoguang mentioned this pull request May 29, 2024
Closed
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 29, 2024
@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 May 30, 2024
@lunny lunny enabled auto-merge (squash) May 30, 2024 01:56
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@lunny lunny merged commit d612a24 into go-gitea:main May 30, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 30, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2024
@wxiaoguang wxiaoguang deleted the fix-find-branch branch May 30, 2024 02:26
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request May 30, 2024
@wxiaoguang
Ignore FindRecentlyPushedNewBranches err (go-gitea#31164)
468d996 
Fix go-gitea#31163
@wxiaoguang wxiaoguang mentioned this pull request May 30, 2024
Merged
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels May 30, 2024
wxiaoguang added a commit that referenced this pull request May 30, 2024
@wxiaoguang
Ignore FindRecentlyPushedNewBranches err (#31164) (#31171)
cc64d4d 
Backport #31164
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 30, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
c74b94c 
* giteaofficial/main: (30 commits)
  Azure blob storage support (go-gitea#30995)
  Use repo as of renderctx's member rather than a repoPath on metas (go-gitea#29222)
  Ignore FindRecentlyPushedNewBranches err (go-gitea#31164)
  [skip ci] Updated translations via Crowdin
  Fix markup preview (go-gitea#31158)
  Swap word order in Comment and Close (go-gitea#31148)
  Fix push multiple branches error with tests (go-gitea#31151)
  Use vertical layout for multiple code expander buttons (go-gitea#31122)
  Remove duplicate `ProxyPreserveHost` in Apache httpd doc (go-gitea#31143)
  [skip ci] Updated translations via Crowdin
  Add an immutable tarball link to archive download headers for Nix (go-gitea#31139)
  Improve mobile review ui (go-gitea#31091)
  Add topics for repository API (go-gitea#31127)
  Add missed return after `ctx.ServerError` (go-gitea#31130)
  Fix API repository object format missed (go-gitea#31118)
  Fix DashboardRepoList margin (go-gitea#31121)
  Update JS dependencies (go-gitea#31120)
  [skip ci] Updated translations via Crowdin
  Prevent simultaneous editing of comments and issues (go-gitea#31053)
  Update demo site location from try.gitea.io -> demo.gitea.com (go-gitea#31054)
  ...
@Ratstail91
Copy link

Wait, this literally just removes a return?

I'm now waiting on the fix mentioned in that issue, but this just looks odd to me.

@delvh
Copy link
Member

delvh commented Jun 23, 2024

The return stopped further execution, and the server error loaded the 500 page.
Thus, we didn't fix the original error but ignored it when it occurs (it will still be present in the logs, but without further consequences - except for no recently pushed to branch notifications on this page load)

@Ratstail91
Copy link

Ok, thanks. I'm done for the night, but will grab the nightly tomorrow, probably.

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yp05327 yp05327 yp05327 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Error - FindRecentlyPushedNewBranches, branch does not exist [repo_id: 64 name: main]
7 participants
@wxiaoguang @Ratstail91 @delvh @lunny @yp05327 @GiteaBot @silverwind