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 issue with broken inter-wiki links #3506 #3560

Merged
merged 1 commit into from
Mar 5, 2018

Conversation

charlesreid1
Copy link
Contributor

This fixes issue #3506, in which inter-wiki links automatically generated in the sidebar contained + signs instead of - signs and were therefore all broken.

@codecov-io
Copy link

codecov-io commented Feb 22, 2018

Codecov Report

Merging #3560 into master will decrease coverage by 0.34%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3560      +/-   ##
==========================================
- Coverage   36.14%   35.79%   -0.35%     
==========================================
  Files         285      285              
  Lines       40925    40868      -57     
==========================================
- Hits        14791    14630     -161     
- Misses      23959    24069     +110     
+ Partials     2175     2169       -6
Impacted Files Coverage Δ
modules/markup/html.go 54.3% <100%> (-35.15%) ⬇️
modules/markup/markup.go 67.27% <0%> (-0.53%) ⬇️
models/repo_indexer.go 48.3% <0%> (ø) ⬆️
routers/admin/admin.go 0% <0%> (ø) ⬆️
models/repo.go 42.8% <0%> (+0.05%) ⬆️
routers/repo/attachment.go 13.33% <0%> (+0.28%) ⬆️
models/gpg_key.go 56.41% <0%> (+0.53%) ⬆️
modules/templates/helper.go 49.65% <0%> (+1.74%) ⬆️
modules/markup/markdown/markdown.go 68.69% <0%> (+2.34%) ⬆️
... and 1 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 171914e...1319642. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 22, 2018
@lunny lunny added the type/bug label Feb 22, 2018
@lunny lunny added this to the 1.5.0 milestone Feb 22, 2018
@lunny
Copy link
Member

lunny commented Feb 22, 2018

Maybe when iswiki is true, we should use - instead of +?

@charlesreid1
Copy link
Contributor Author

Just to pull this out of the (buried) comment in the last commit:

There are two more locations where +s are added to links, making me think + was chosen for a reason. @lunny adding a check for iswiki would be good - when are the + signs used in links? when links are to files within the repo?

@lafriks
Copy link
Member

lafriks commented Feb 22, 2018

@charlesreid1 yes as files added to wiki git can contain spaces

@lafriks
Copy link
Member

lafriks commented Mar 5, 2018

@charlesreid1 I hope you do not mind I overwrite your commit as only single place was needed to be changed afaik. Also added tests for links with spaces.

@lafriks lafriks modified the milestones: 1.5.0, 1.4.0 Mar 5, 2018
@tboerger tboerger 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 Mar 5, 2018
@tboerger tboerger 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 Mar 5, 2018
@lafriks lafriks merged commit 69ea5e4 into go-gitea:master Mar 5, 2018
@charlesreid1
Copy link
Contributor Author

Thanks for fixing this up @lafriks!

@lafriks
Copy link
Member

lafriks commented Mar 5, 2018

@charlesreid1 thanks for pinpointing the problem ;)

lafriks pushed a commit to lafriks-fork/gitea that referenced this pull request Mar 6, 2018
@lafriks lafriks added the backport/done All backports for this PR have been created label Mar 6, 2018
@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