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

Add changelog for 1.20.1 #26015

Merged
merged 3 commits into from Jul 22, 2023
Merged

Add changelog for 1.20.1 #26015

merged 3 commits into from Jul 22, 2023

Conversation

delvh
Copy link
Member

@delvh delvh commented Jul 20, 2023

No description provided.

@delvh delvh added type/changelog Adds the changelog for a new Gitea version skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.20 This PR should be backported to Gitea 1.20 labels Jul 20, 2023
@delvh delvh self-assigned this Jul 20, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 20, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 20, 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 Jul 20, 2023
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jul 20, 2023 •
edited

Should it wait for #26007 (revert the fatal log for lfs path) or not?

I am neutral for it, but actually:

  • If it needs to wait, then wait for it
  • If it doesn't need to wait, then #26007 doesn't seem useful after this release, because there might be a long time to next release.

@wxiaoguang
Copy link
Contributor

And this one: Fix the route for pull-request's authors #26016

@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 Jul 20, 2023
@wxiaoguang wxiaoguang mentioned this pull request Jul 20, 2023
Closed
@delvh
Copy link
Member Author

delvh commented Jul 21, 2023

As it seems, #26007 will likely not be merged.
As such, all changes for 1.20.1 are present.

@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 21, 2023
@wxiaoguang
Copy link
Contributor

As it seems, #26007 will likely not be merged.

TBH, I don't understand, and I don't see any objection for it.

(merging or not either is fine to me, I just don't understand how Gitea maintainers come to an agreement)

@delvh
Copy link
Member Author

delvh commented Jul 22, 2023

Well, my reasoning is the following:
I've said that I don't care about the outcome, as long as we decide quickly. Almost nothing has happened the last two days.
You yourself said that we should shutdown if the logic changes drastically to prevent unintended things.
The change from [server].LFS_CONTENT_PATH to [lfs].PATH is one such thing.
I've interpreted the maintainer chat as that there's general consensus to not remove the fatal warning.

@lunny lunny merged commit d6d39cc into go-gitea:main Jul 22, 2023
24 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jul 22, 2023
@GiteaBot GiteaBot mentioned this pull request Jul 22, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jul 22, 2023
@delvh @GiteaBot
Add changelog for 1.20.1 (go-gitea#26015)
05998f4
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jul 22, 2023
@delvh delvh deleted the changelog-1.20.1 branch July 22, 2023 09:01
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 22, 2023
@wxiaoguang
Copy link
Contributor

I've interpreted the maintainer chat as that there's general consensus to not remove the fatal warning.

I guess there are some misunderstanding on this problem and that PR. My understanding is that the fatal should be kept if the option is removed, but if the option is still supportted, there is no disagreement for reverting.

I won't waste time on it either.....

@wxiaoguang
Copy link
Contributor

Almost nothing has happened the last two days.

The owner/TOC team just seem disappearing for such big/urgent decision

delvh added a commit that referenced this pull request Jul 22, 2023
@GiteaBot @delvh
Add changelog for 1.20.1 (#26015) (#26056)
221b90d 
Backport #26015 by @delvh

Co-authored-by: delvh <dev.lh@web.de>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees

@delvh delvh

Labels
backport/done All backports for this PR have been created 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/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/changelog Adds the changelog for a new Gitea version
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@delvh @wxiaoguang @lunny @GiteaBot