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

Decrement Fork Num when converting from Fork #17035

Merged
merged 3 commits into from
Sep 14, 2021
Merged

Decrement Fork Num when converting from Fork #17035

merged 3 commits into from
Sep 14, 2021

Conversation

zeripath
Copy link
Contributor

When converting repositories from forks to normal the root NumFork needs to be
decremented too.

Fix #17026

Signed-off-by: Andrew Thornton [email protected]

@zeripath zeripath added this to the 1.16.0 milestone Sep 13, 2021
@zeripath
Decrement Fork Num when converting from Fork
05f4fc4 
When converting repositories from forks to normal the root NumFork needs to be
decremented too.

Fix go-gitea#17026

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath force-pushed the fix-17026-reduce-num-forks-when-converting-to-repo branch from cc31a7f to 05f4fc4 Compare September 13, 2021 19:32
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 13, 2021
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (main@04b233e). Click here to learn what that means.
The diff coverage is 0.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #17035   +/-   ##
=======================================
  Coverage        ?   45.21%           
=======================================
  Files           ?      766           
  Lines           ?    86656           
  Branches        ?        0           
=======================================
  Hits            ?    39185           
  Misses          ?    41127           
  Partials        ?     6344
Impacted Files Coverage Δ
models/repo.go 54.36% <0.00%> (ø)
modules/repository/fork.go 37.97% <0.00%> (ø)
routers/web/repo/setting.go 14.39% <0.00%> (ø)

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 04b233e...659296d. Read the comment docs.

@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 14, 2021
@zeripath
Copy link
Contributor Author

make lgtm work

@zeripath zeripath merged commit 0a542dd into go-gitea:main Sep 14, 2021
@zeripath zeripath deleted the fix-17026-reduce-num-forks-when-converting-to-repo branch September 14, 2021 17:07
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 14, 2021
@zeripath
Decrement Fork Num when converting from Fork (go-gitea#17035)
b11aff4 
Backport go-gitea#17035

When converting repositories from forks to normal the root NumFork needs to be
decremented too.

Fix go-gitea#17026

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Sep 14, 2021
Merged
@zeripath zeripath added the backport/done All backports for this PR have been created label Sep 14, 2021
lunny pushed a commit that referenced this pull request Sep 15, 2021
@zeripath
Decrement Fork Num when converting from Fork (#17035) (#17046)
0e448fb 
Backport #17035

When converting repositories from forks to normal the root NumFork needs to be
decremented too.

Fix #17026

Signed-off-by: Andrew Thornton <[email protected]>
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 19, 2021
@zeripath
Changelog 1.15.3
b0c5677 
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19

* ENHANCEMENTS
  * Add fluid to ui container class to remove margin (go-gitea#16396) (go-gitea#16976)
  * Add caller to cat-file batch calls (go-gitea#17082) (go-gitea#17089)
* BUGFIXES
  * Render full plain readme. (go-gitea#17083) (go-gitea#17090)
  * Upgrade xorm to v1.2.4 (go-gitea#17059)
  * Fix bug of migrate comments which only fetch one page (go-gitea#17055) (go-gitea#17058)
  * Do not show issue context popup on external issues (go-gitea#17050) (go-gitea#17054)
  * Decrement Fork Num when converting from Fork (go-gitea#17035) (go-gitea#17046)
  * Correctly rollback in ForkRepository (go-gitea#17034) (go-gitea#17045)
  * Fix missing close in WalkGitLog (go-gitea#17008) (go-gitea#17009)
  * Add prefix to SVG id/class attributes (go-gitea#16997) (go-gitea#17000)
  * Fix bug of migrated repository not index (go-gitea#16991) (go-gitea#16996)
  * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (go-gitea#16988) (go-gitea#16990)
  * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (go-gitea#16971) (go-gitea#16977)
  * Fix issue with issue default mail template (go-gitea#16956) (go-gitea#16975)
  * Ensure that rebase conflicts are handled in updates (go-gitea#16952) (go-gitea#16960)
  * Prevent panic on diff generation (go-gitea#16950) (go-gitea#16951)

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Sep 19, 2021
Merged
lunny pushed a commit that referenced this pull request Sep 20, 2021
@zeripath @techknowlogick
Changelog 1.15.3 (#17091)
7ce938b 
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19

* ENHANCEMENTS
  * Add fluid to ui container class to remove margin (#16396) (#16976)
  * Add caller to cat-file batch calls (#17082) (#17089)
* BUGFIXES
  * Render full plain readme. (#17083) (#17090)
  * Upgrade xorm to v1.2.4 (#17059)
  * Fix bug of migrate comments which only fetch one page (#17055) (#17058)
  * Do not show issue context popup on external issues (#17050) (#17054)
  * Decrement Fork Num when converting from Fork (#17035) (#17046)
  * Correctly rollback in ForkRepository (#17034) (#17045)
  * Fix missing close in WalkGitLog (#17008) (#17009)
  * Add prefix to SVG id/class attributes (#16997) (#17000)
  * Fix bug of migrated repository not index (#16991) (#16996)
  * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (#16988) (#16990)
  * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (#16971) (#16977)
  * Fix issue with issue default mail template (#16956) (#16975)
  * Ensure that rebase conflicts are handled in updates (#16952) (#16960)
  * Prevent panic on diff generation (#16950) (#16951)

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Sep 21, 2021
@zeripath @techknowlogick @6543
Changelog 1.15.3 (go-gitea#17091)
a0bd752 
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19

* ENHANCEMENTS
  * Add fluid to ui container class to remove margin (go-gitea#16396) (go-gitea#16976)
  * Add caller to cat-file batch calls (go-gitea#17082) (go-gitea#17089)
* BUGFIXES
  * Render full plain readme. (go-gitea#17083) (go-gitea#17090)
  * Upgrade xorm to v1.2.4 (go-gitea#17059)
  * Fix bug of migrate comments which only fetch one page (go-gitea#17055) (go-gitea#17058)
  * Do not show issue context popup on external issues (go-gitea#17050) (go-gitea#17054)
  * Decrement Fork Num when converting from Fork (go-gitea#17035) (go-gitea#17046)
  * Correctly rollback in ForkRepository (go-gitea#17034) (go-gitea#17045)
  * Fix missing close in WalkGitLog (go-gitea#17008) (go-gitea#17009)
  * Add prefix to SVG id/class attributes (go-gitea#16997) (go-gitea#17000)
  * Fix bug of migrated repository not index (go-gitea#16991) (go-gitea#16996)
  * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (go-gitea#16988) (go-gitea#16990)
  * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (go-gitea#16971) (go-gitea#16977)
  * Fix issue with issue default mail template (go-gitea#16956) (go-gitea#16975)
  * Ensure that rebase conflicts are handled in updates (go-gitea#16952) (go-gitea#16960)
  * Prevent panic on diff generation (go-gitea#16950) (go-gitea#16951)

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
lunny pushed a commit that referenced this pull request Sep 22, 2021
@6543 @zeripath @techknowlogick
Changelog 1.15.3 (#17091) (#17113)
fc1e9e6 
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19

* ENHANCEMENTS
  * Add fluid to ui container class to remove margin (#16396) (#16976)
  * Add caller to cat-file batch calls (#17082) (#17089)
* BUGFIXES
  * Render full plain readme. (#17083) (#17090)
  * Upgrade xorm to v1.2.4 (#17059)
  * Fix bug of migrate comments which only fetch one page (#17055) (#17058)
  * Do not show issue context popup on external issues (#17050) (#17054)
  * Decrement Fork Num when converting from Fork (#17035) (#17046)
  * Correctly rollback in ForkRepository (#17034) (#17045)
  * Fix missing close in WalkGitLog (#17008) (#17009)
  * Add prefix to SVG id/class attributes (#16997) (#17000)
  * Fix bug of migrated repository not index (#16991) (#16996)
  * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (#16988) (#16990)
  * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (#16971) (#16977)
  * Fix issue with issue default mail template (#16956) (#16975)
  * Ensure that rebase conflicts are handled in updates (#16952) (#16960)
  * Prevent panic on diff generation (#16950) (#16951)

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: techknowlogick <[email protected]>

Co-authored-by: zeripath <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@noerw noerw noerw approved these changes

@axifive axifive axifive 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.16.0
Development

Successfully merging this pull request may close these issues.

The derived warehouse is converted to an ordinary warehouse, and the derived quantity has not changed
5 participants
@zeripath @codecov-commenter @axifive @noerw @GiteaBot