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

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

Merged
merged 1 commit into from
May 11, 2019
Merged

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

merged 1 commit into from
May 11, 2019

Conversation

jbeyerstedt
Copy link
Contributor

From the branch protection description text it was not quite clear, when only force pushing will be disallowed and with what configuration normal pushing will also be disallowed.
See issue #6886 for details.

The branch protection description text were not quite accurate.
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 11, 2019
@techknowlogick techknowlogick added the topic/ui Change the appearance of the Gitea UI label May 11, 2019
@techknowlogick techknowlogick added this to the 1.9.0 milestone May 11, 2019
@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 May 11, 2019
@zeripath
Copy link
Contributor

Thanks @jbeyerstedt

@codecov-io
Copy link

Codecov Report

Merging #6906 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6906      +/-   ##
==========================================
+ Coverage   41.41%   41.42%   +<.01%     
==========================================
  Files         432      432              
  Lines       59541    59541              
==========================================
+ Hits        24661    24664       +3     
+ Misses      31641    31639       -2     
+ Partials     3239     3238       -1
Impacted Files Coverage Δ
routers/repo/view.go 42.02% <0%> (-1.02%) ⬇️
modules/log/event.go 65.98% <0%> (+1.52%) ⬆️
modules/log/file.go 77.62% <0%> (+2.09%) ⬆️
modules/log/router.go 92.5% <0%> (+2.5%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1dc4016...3444553. Read the comment docs.

@lafriks lafriks merged commit f378cb5 into go-gitea:master May 11, 2019
zeripath pushed a commit to zeripath/gitea that referenced this pull request May 11, 2019
…a#6906)

The branch protection description text were not quite accurate.
techknowlogick pushed a commit that referenced this pull request 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
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants