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

Merge templates/projects/list.tmpl and templates/repo/projects/list.tmpl together #26265

Merged
merged 4 commits into from
Aug 1, 2023

Conversation

earl-warren
Copy link
Contributor

(cherry picked from commit 473862a1d599382ca022482e2e044025872d240b)

Refs: https://codeberg.org/forgejo/forgejo/pulls/1126

(cherry picked from commit 473862a1d599382ca022482e2e044025872d240b)

Refs: https://codeberg.org/forgejo/forgejo/pulls/1126
@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/L Denotes a PR that changes 100-499 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
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

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

Thanks to both of you, earl and louis, now I have less work to do (#25123 (comment)).
I don't know why the solution works but I'm fine with it working. I didn't expect it to be that easy, it looked like that would need a lot more changes…
The only thing that remains for my point

Merging the separate project templates together

Is the actual display of one project (templates/projects/view.tmpl vs templates/repo/projects/view.tmpl). Merging Creation/Edits and List are already done then…

templates/projects/list.tmpl Show resolved Hide resolved
@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
@delvh delvh changed the title keep templates/repo/projects/list DRY Merge templates/project/list.tmpl and templates/repo/projects/list.tmpl together Aug 1, 2023
@delvh delvh changed the title Merge templates/project/list.tmpl and templates/repo/projects/list.tmpl together Merge templates/projects/list.tmpl and templates/repo/projects/list.tmpl together Aug 1, 2023
@lunny lunny added type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Aug 1, 2023
@lunny
Copy link
Member

lunny commented Aug 1, 2023

It also fixed some bugs.

@lunny lunny added the backport/v1.20 This PR should be backported to Gitea 1.20 label Aug 1, 2023
@lunny
Copy link
Member

lunny commented Aug 1, 2023

The bug could be backport to v1.20 but I don't whether the refacto can do also.

@delvh
Copy link
Member

delvh commented Aug 1, 2023

Which bug did it fix?

lunny
lunny previously requested changes Aug 1, 2023
templates/projects/list.tmpl Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Aug 1, 2023
@delvh delvh dismissed lunny’s stale review August 1, 2023 11:31

Concern not valid (for some reason)

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Aug 1, 2023
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 1, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Aug 1, 2023
@silverwind silverwind enabled auto-merge (squash) August 1, 2023 15:41
@silverwind silverwind merged commit 6ed4626 into go-gitea:main Aug 1, 2023
23 checks passed
@GiteaBot
Copy link
Contributor

GiteaBot commented Aug 1, 2023

I was unable to create a backport for 1.20. @earl-warren, please send one manually. 🍵

go run ./contrib/backport 26265
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Aug 1, 2023
@denyskon
Copy link
Member

denyskon commented Aug 1, 2023

Why do we backport a refactor? 😳

@delvh
Copy link
Member

delvh commented Aug 1, 2023

Well, I don't know either.
According to @lunny it fixes some ominous bugs but I don't know which bugs exactly…

@lunny
Copy link
Member

lunny commented Aug 2, 2023

It checks the archive repositories to prevent to display the new project button

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)
@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
backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants