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

Fix submodule paths when AppSubUrl is not root #11098

Merged
merged 7 commits into from
Apr 22, 2020

Conversation

zeripath
Copy link
Contributor

Fix #11002

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

Fix go-gitea#11002

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.12.0 milestone Apr 16, 2020
@guillep2k
Copy link
Member

Unit test failing (related)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 18, 2020
@6543

This comment has been minimized.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@@ -51,14 +52,10 @@ func getRefURL(refURL, urlPrefix, parentPath string) string {
urlPrefixHostname = prefixURL.Host
}

// FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules
Copy link
Member

@6543 6543 Apr 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

o no a fixme 😆 - just jocking

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 20, 2020
@codecov-io
Copy link

Codecov Report

Merging #11098 into master will decrease coverage by 0.20%.
The diff coverage is 4.70%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11098      +/-   ##
==========================================
- Coverage   43.44%   43.24%   -0.21%     
==========================================
  Files         600      601       +1     
  Lines       85135    85599     +464     
==========================================
+ Hits        36988    37015      +27     
- Misses      43575    44016     +441     
+ Partials     4572     4568       -4     
Impacted Files Coverage Δ
models/review.go 29.57% <0.00%> (-0.07%) ⬇️
modules/migrations/base/downloader.go 23.93% <0.00%> (-2.74%) ⬇️
modules/migrations/base/pullrequest.go 0.00% <ø> (ø)
modules/migrations/migrate.go 20.00% <0.00%> (-0.96%) ⬇️
modules/structs/repo.go 54.54% <ø> (+18.18%) ⬆️
routers/api/v1/repo/pull.go 33.80% <0.00%> (-0.93%) ⬇️
routers/private/serv.go 33.44% <0.00%> (ø)
routers/repo/http.go 41.68% <0.00%> (ø)
modules/migrations/gitlab.go 1.67% <1.67%> (ø)
modules/git/submodule.go 75.00% <80.00%> (ø)
... and 11 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 cac6990...0827800. Read the comment docs.

@@ -69,16 +66,16 @@ func getRefURL(refURL, urlPrefix, parentPath string) string {

m := match[0]
refHostname := m[2]
path := m[3]
pth := m[3]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤣

@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 Apr 22, 2020
@6543
Copy link
Member

6543 commented Apr 22, 2020

ping lgtm

@zeripath zeripath merged commit 4ee70a9 into go-gitea:master Apr 22, 2020
@zeripath zeripath deleted the fix-submodules branch April 22, 2020 10:34
zeripath added a commit to zeripath/gitea that referenced this pull request Apr 22, 2020
Backport go-gitea#11098

Fix go-gitea#11002

Signed-off-by: Andrew Thornton <art27@cantab.net>
@lafriks lafriks added the backport/done All backports for this PR have been created label Apr 22, 2020
zeripath added a commit that referenced this pull request Apr 22, 2020
Backport #11098

Fix #11002

Signed-off-by: Andrew Thornton <art27@cantab.net>
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
Fix submodule paths when AppSubUrl is not root

Fix go-gitea#11002

Signed-off-by: Andrew Thornton <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.

Link to submodule hosted by the same server via ssh missing port/prefix
6 participants