github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-15 20:09:18 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Request: Disable certain merge strategies in pull requests #5721

New Issue
Closed
opened 2025-11-02 06:34:00 -06:00 by GiteaMirror · 2 comments
GiteaMirror commented 2025-11-02 06:34:00 -06:00
Owner
Copy Link

Originally created by @lumio on GitHub (Jul 10, 2020).

  • Gitea version (or commit ref): 1.13.0+dev-242-g0b1bb9644 built with GNU Make 4.3, go1.14.4 : bindata, sqlite, sqlite_unlock_notify (latest docker container)
  • Git version: 2.26.2
  • Operating system: (latest docker container)
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No
    • Not relevant
  • Log gist:

Description

It is great to be able to chose the merge strategy for a pull request, similar like GitHub.
However, it would be great to be able to disable certain merge strategies all together. We enforce commit signatures and allowing a PR to be squashed would also more or less remove those signatures, leaving one single commit with the default key.

I thought of new options for [repository.pull-request] like the following:

  • DISABLE_STRATEGY_REBASE
  • DISABLE_STRATEGY_REBASE_NO_FF
  • DISABLE_STRATEGY_SQUASH
  • DISABLE_STRATEGY_RECURSIVE (default merge strategy - could be left out in my opinion)
Originally created by @lumio on GitHub (Jul 10, 2020). <!-- NOTE: If your issue is a security concern, please send an email to security@gitea.io instead of opening a public issue --> <!-- 1. Please speak English, this is the language all maintainers can speak and write. 2. Please ask questions or configuration/deploy problems on our Discord server (https://discord.gg/gitea) or forum (https://discourse.gitea.io). 3. Please take a moment to check that your issue doesn't already exist. 4. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report. --> - Gitea version (or commit ref): 1.13.0+dev-242-g0b1bb9644 built with GNU Make 4.3, go1.14.4 : bindata, sqlite, sqlite_unlock_notify (latest docker container) - Git version: 2.26.2 - Operating system: (latest docker container) - Database (use `[x]`): - [ ] PostgreSQL - [ ] MySQL - [ ] MSSQL - [x] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [ ] No - [x] Not relevant - Log gist: ## Description It is great to be able to chose the merge strategy for a pull request, similar like GitHub. However, it would be great to be able to disable certain merge strategies all together. We enforce commit signatures and allowing a PR to be squashed would also more or less remove those signatures, leaving one single commit with the default key. I thought of new options for `[repository.pull-request]` like the following: - `DISABLE_STRATEGY_REBASE` - `DISABLE_STRATEGY_REBASE_NO_FF` - `DISABLE_STRATEGY_SQUASH` - `DISABLE_STRATEGY_RECURSIVE` (default merge strategy - could be left out in my opinion)
GiteaMirror commented 2025-11-02 06:34:01 -06:00
Author
Owner
Copy Link

@jolheiser commented on GitHub (Jul 10, 2020):

This is already available through repository settings.

@jolheiser commented on GitHub (Jul 10, 2020): This is already available through repository settings.
GiteaMirror commented 2025-11-02 06:34:01 -06:00
Author
Owner
Copy Link

@lumio commented on GitHub (Jul 11, 2020):

Ah I was looking on the wrong section. I thought I would find it in the Branch section. Thank you

@lumio commented on GitHub (Jul 11, 2020): Ah I was looking on the wrong section. I thought I would find it in the `Branch` section. Thank you
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#5721
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?