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

Some fixes of the prompt of new branches #26257

Merged
merged 4 commits into from
Aug 1, 2023

Conversation

Zettat123
Copy link
Contributor

Related to #26239

This PR makes some fixes:

  • do not show the prompt for mirror repos and repos with pull request units disabled
  • use commit_time instead of updated_unix, as commit_time is the real time when the branch was pushed

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 1, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 1, 2023
@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 Aug 1, 2023
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Aug 1, 2023
@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 Aug 1, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 1, 2023
@denyskon denyskon added this to the 1.21.0 milestone Aug 1, 2023
@lunny lunny enabled auto-merge (squash) August 1, 2023 06:51
@lunny lunny merged commit 9a65d01 into go-gitea:main Aug 1, 2023
23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 1, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 2, 2023
* upstream/main:
  Clarify the logger's MODE config option (go-gitea#26267)
  speed up TestEventSourceManagerRun (go-gitea#26262)
  Merge `templates/projects/list.tmpl` and `templates/repo/projects/list.tmpl` together (go-gitea#26265)
  Allow editing push mirrors after creation (go-gitea#26151)
  Update Arch linux URL from community to extra (go-gitea#26273)
  Fix due date rendering the wrong date in issue (go-gitea#26268)
  Some fixes of the prompt of new branches (go-gitea#26257)

showRecentlyPushedNewBranches := true
if ctx.Repo.Repository.IsMirror ||
!ctx.Repo.Repository.UnitEnabled(ctx, unit_model.TypePullRequests) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this unit check should be baseRepo.UnitEnabled() not ctx.Repo.UnitEnabled().
If the context repo is a fork repo without PR unit, we should also show them as the base repo's PR unit is enabled and we can create PRs.
And for the similar reason, we should also check whether baseRepo is a mirror repo.

Will be fixed in #25812.

Copy link
Contributor

Choose a reason for hiding this comment

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

And maybe we also need to check the unit permission. 🤔

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 30, 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. 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.

5 participants