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.

Sign up for GitHub

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

Jump to bottom

Enforce setting HEAD in wiki to master #13950

Merged
merged 2 commits into from
Dec 12, 2020
Merged

Enforce setting HEAD in wiki to master #13950

merged 2 commits into from
Dec 12, 2020

Conversation

zeripath
Copy link
Contributor

The default branch in wikis must be master - therefore forcibly set the HEAD
to master.

Fix #13846

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

@zeripath
Enforce setting HEAD in wiki to master
f7a2467 
The default branch in wikis must be master - therefore forcibly set the HEAD
to master.

Fix go-gitea#13846

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.14.0 milestone Dec 11, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 11, 2020
@silverwind
Copy link
Member

We can't have it follow the default branch name setting?

@6543
Copy link
Member

6543 commented Dec 11, 2020

We can't have it follow the default branch name setting?

I think this should be doable but not as backportable bugfix

@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 Dec 12, 2020
@codecov-io
Copy link

Codecov Report

Merging #13950 (1e46143) into master (1837e64) will decrease coverage by 0.04%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13950      +/-   ##
==========================================
- Coverage   42.25%   42.20%   -0.05%     
==========================================
  Files         710      710              
  Lines       77226    77228       +2     
==========================================
- Hits        32628    32592      -36     
- Misses      39235    39260      +25     
- Partials     5363     5376      +13
Impacted Files Coverage Δ
services/wiki/wiki.go 57.94% <0.00%> (-0.61%) ⬇️
models/repo_mirror.go 2.38% <0.00%> (-11.91%) ⬇️
modules/cron/tasks_basic.go 87.35% <0.00%> (-3.45%) ⬇️
services/pull/check.go 48.90% <0.00%> (-2.92%) ⬇️
modules/notification/ui/ui.go 93.05% <0.00%> (-2.78%) ⬇️
modules/process/manager.go 72.50% <0.00%> (-2.50%) ⬇️
modules/charset/charset.go 68.53% <0.00%> (-2.25%) ⬇️
services/gitdiff/gitdiff.go 69.05% <0.00%> (-1.94%) ⬇️
services/mirror/mirror.go 15.78% <0.00%> (-1.11%) ⬇️
models/notification.go 66.25% <0.00%> (-0.99%) ⬇️
... and 6 more

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 1837e64...1e46143. Read the comment docs.

@6543 6543 merged commit f9c0737 into go-gitea:master Dec 12, 2020
6543 added a commit to 6543-forks/gitea that referenced this pull request Dec 12, 2020
@zeripath @6543
Enforce setting HEAD in wiki to master (go-gitea#13950)
f21d03b 
The default branch in wikis must be master - therefore forcibly set the HEAD
to master.

Fix go-gitea#13846

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

Co-authored-by: 6543 <6543@obermui.de>
@6543 6543 mentioned this pull request Dec 12, 2020
Merged
@6543 6543 added the backport/done All backports for this PR have been created label Dec 12, 2020
@6543
Copy link
Member

6543 commented Dec 12, 2020

backport: #13961

zeripath added a commit that referenced this pull request Dec 12, 2020
@6543 @zeripath
Enforce setting HEAD in wiki to master (#13950) (#13961)
05ee88e 
The default branch in wikis must be master - therefore forcibly set the HEAD
to master.

Fix #13846

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

Co-authored-by: 6543 <6543@obermui.de>

Co-authored-by: zeripath <art27@cantab.net>
@zeripath zeripath deleted the fix-13846-enforce-default-wiki-branch-is-master branch December 12, 2020 17:22
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@a1012112796 a1012112796 a1012112796 approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

[Bug] error 128 when creating NEW Wiki page
6 participants
@zeripath @silverwind @6543 @codecov-io @a1012112796 @GiteaBot