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

Default merge message changed in 1.17.0 #20634

Closed
parnic opened this issue Aug 2, 2022 · 2 comments · Fixed by #20645
Closed

Default merge message changed in 1.17.0 #20634

parnic opened this issue Aug 2, 2022 · 2 comments · Fixed by #20645
Labels
Milestone

Comments

@parnic
Copy link
Contributor

parnic commented Aug 2, 2022

Description

Prior to 1.17.0, clicking the merge button on a PR would pop up a box that either contained the PR description (the default behavior) or a combination of all commit messages (if POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES is set in the INI). In 1.17.0, the commit message only contains the contents of the default merge template and nothing else.

Prior to 1.17.0: pull.GetSquashMergeCommitMessages() was used to populate the box (even when it wasn't a squash merge). This is set to ctx.Data["GetCommitMessages"] in repo.PrepareViewPullInfo().
After 1.17.0: defaultMergeMessage in pull.tmpl is set to a specific Reviewed-on string that doesn't include the PR description or commit messages or anything.

If this new behavior is the intended method, it would be nice to config-ify it, but it feels more like a bug than anything.

Gitea Version

1.17.0, 1.18.0+dev-203-ge43bb2b0b

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Screenshots

image

image

Git Version

2.37.1

Operating System

Ubuntu 20.04

How are you running Gitea?

Downloaded from Github releases page.

Database

PostgreSQL

@parnic parnic added the type/bug label Aug 2, 2022
@wxiaoguang
Copy link
Contributor

Will it fixed by #20618 ?

@parnic
Copy link
Contributor Author

parnic commented Aug 2, 2022

Will it fixed by #20618 ?

Yes! That's exactly the change I was making locally to fix this, haha. Great! 😄

@wxiaoguang wxiaoguang added this to the 1.17.1 milestone Aug 2, 2022
@noerw noerw closed this as completed Aug 4, 2022
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants