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

On Migration respect old DefaultBranch #12843

Merged

Conversation

6543
Copy link
Member

@6543 6543 commented Sep 14, 2020

fix a bug

@6543 6543 mentioned this pull request Sep 14, 2020
7 tasks
@6543 6543 added this to the 1.13.0 milestone Sep 14, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 15, 2020
@lunny
Copy link
Member

lunny commented Sep 15, 2020

tests failed related.

@6543
Copy link
Member Author

6543 commented Sep 15, 2020

@lunny should be fixed

@codecov-commenter
Copy link

codecov-commenter commented Sep 15, 2020

Codecov Report

Merging #12843 into master will decrease coverage by 0.02%.
The diff coverage is 65.11%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12843      +/-   ##
==========================================
- Coverage   43.17%   43.15%   -0.03%     
==========================================
  Files         654      654              
  Lines       72218    72201      -17     
==========================================
- Hits        31182    31160      -22     
- Misses      35985    35989       +4     
- Partials     5051     5052       +1     
Impacted Files Coverage Δ
modules/migrations/gitlab.go 1.04% <0.00%> (-0.01%) ⬇️
routers/user/notification.go 40.17% <0.00%> (-0.37%) ⬇️
modules/repository/repo.go 43.31% <60.00%> (+0.73%) ⬆️
services/pull/pull.go 40.78% <78.57%> (-0.79%) ⬇️
modules/migrations/gitea.go 6.87% <100.00%> (+0.17%) ⬆️
modules/migrations/github.go 81.28% <100.00%> (+0.15%) ⬆️
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/git/repo.go 46.70% <0.00%> (-3.05%) ⬇️
modules/log/file.go 73.60% <0.00%> (-1.61%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
... and 4 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 3d0ad28...59edee8. Read the comment docs.

@1byte2bytes
Copy link

Hi there! Thanks, I do believe this was the issue I am facing. I’m super sorry, I accidentally reported the Go version on the bottom of the page, not the Gitea version of 1.12.4. It’s been a very tiring time over here on the west coast, especially with my full work days, I must’ve just wrote the first version number looking thing I saw

@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 Sep 15, 2020
@lunny lunny merged commit 6c61f49 into go-gitea:master Sep 15, 2020
@6543 6543 deleted the fix-migration-respect-old-default-branch branch September 15, 2020 15:35
6543 added a commit to 6543-forks/gitea that referenced this pull request Sep 15, 2020
* On Migration respect old DefaultBranch

* add DefaultBranch int test set

Co-authored-by: zeripath <art27@cantab.net>
@6543 6543 added the backport/done All backports for this PR have been created label Sep 15, 2020
@6543
Copy link
Member Author

6543 commented Sep 15, 2020

backport: #12858

techknowlogick pushed a commit that referenced this pull request Sep 15, 2020
* On Migration respect old DefaultBranch

* add DefaultBranch int test set

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
@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
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
Development

Successfully merging this pull request may close these issues.

7 participants