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

Misleading description at branch protection settings #6886

Closed
jbeyerstedt opened this issue May 9, 2019 · 3 comments
Closed

Misleading description at branch protection settings #6886

jbeyerstedt opened this issue May 9, 2019 · 3 comments

Comments

@jbeyerstedt
Copy link
Contributor

  • Gitea version (or commit ref): eb8632b

Description

As also discussed in #6817, the description texts at the branch protection settings do not exactly describe, what will happen. This lead to confusion, when force pushing will be disallowed and when a "normal" push will also not be possible.

The text at the "Enable branch protection" checkbox says:

Prevent deletion and disable Git force pushing to the branch.

This is would be, what I expect to happen, when the checkbox is activated. No-one will be able to delete this branch and force pushing will also not be possible. But the issue is, that any kind of pushing is disabled (which is not, what the text says).

Then there is the "Enable push whitelist" button, which has the explanation:

Allow whitelisted users or teams to bypass push restrictions.
This does not clearly say, if the whitelist will only be allowed to push normally, or also be allowed to force push.

Screenshots

Bildschirmfoto 2019-05-09 um 07 53 30

@zeripath
Copy link
Contributor

zeripath commented May 9, 2019

@jbeyerstedt do you think this just needs a simple change of wording?

If so, could you send a PR with your proposed changes? The settings are around:

settings.protect_this_branch_desc = Prevent deletion and disable Git force pushing to the branch.

@jbeyerstedt
Copy link
Contributor Author

Yes, this issue is just about the wording.
Thanks for the hint, where to find the description strings. I'll try to get into this and submit a pull request on the weekend.

@jbeyerstedt
Copy link
Contributor Author

@zeripath Here's your pull request. (Now opened in the right repo)
And as I write, it was approved by someone. Thanks.

zeripath pushed a commit to zeripath/gitea that referenced this issue May 11, 2019
…a#6906)

The branch protection description text were not quite accurate.
techknowlogick pushed a commit that referenced this issue May 11, 2019
* Add options to git.Clone to make it more capable

* Begin the process of removing the local copy and tidy up

* Remove Wiki LocalCopy Checkouts

* Remove the last LocalRepo helpers

* Remove WithTemporaryFile

* Enable push-hooks for these routes

* Ensure tests cope with hooks

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Remove Repository.LocalCopyPath()

* Move temporary repo to use the standard temporary path

* Fix the tests

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Remove LocalWikiPath

* Fix missing remove

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Use AppURL for Oauth user link (#6894)

* Use AppURL for Oauth user link

Fix #6843

* Update oauth.go

* Update oauth.go

* internal/ssh: ignore env command totally (#6825)

* ssh: ignore env command totally

* Remove commented code 

Needed fix described in issue #6889

* Escape the commit message on issues update and title in telegram hook (#6901)

* update sdk to latest (#6903)

* improve description of branch protection (fix #6886) (#6906)

The branch protection description text were not quite accurate.

* Fix logging documentation (#6904)

* ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG

* Allow DISABLE_ROUTER_LOG to be set in the [log] section

* [skip ci] Updated translations via Crowdin

* Move sdk structs to modules/structs (#6905)

* move sdk structs to moduels/structs

* fix tests

* fix fmt

* fix swagger

* fix vendor
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants