Skip to content

Default merge message changed in 1.17.0 #20634

Closed
@parnic

Description

@parnic

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions