Skip to content

Conversation

zeripath
Copy link
Contributor

Unfortunately it appears that a small bit of debugging code was left in blob_excerpt.tmpl
This breaks diff expansion causing #18281.

Fix #18281

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

Unfortunately it appears that a small bit of debugging code was left in blob_excerpt.tmpl
This breaks diff expansion causing go-gitea#18281.

Fix go-gitea#18281

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jan 15, 2022
@zeripath zeripath added this to the 1.16.0 milestone Jan 15, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 15, 2022
@wxiaoguang
Copy link
Contributor

How about line 71:

<td class="blob-excerpt lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code class="code-inner">{{$.section.GetComputedInlineDiffFor $line}}</code></td>

Is it ({{$.section.GetComputedInlineDiffFor $line}}) trying to output the struct DiffInline?

@zeripath
Copy link
Contributor Author

yup that also needs fixing..

@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 Jan 16, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #18287 (b61d8cc) into main (661d3d2) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #18287   +/-   ##
=======================================
  Coverage   45.73%   45.73%           
=======================================
  Files         831      831           
  Lines       92172    92172           
=======================================
+ Hits        42154    42159    +5     
+ Misses      43260    43257    -3     
+ Partials     6758     6756    -2     
Impacted Files Coverage Δ
modules/queue/queue_channel.go 95.00% <0.00%> (-1.67%) ⬇️
modules/log/file.go 73.60% <0.00%> (-1.61%) ⬇️
services/pull/pull.go 41.70% <0.00%> (-0.41%) ⬇️
modules/queue/workerpool.go 50.00% <0.00%> (ø)
models/issue_comment.go 55.08% <0.00%> (+0.28%) ⬆️
routers/api/v1/repo/pull.go 28.85% <0.00%> (+0.50%) ⬆️
models/repo_list.go 77.21% <0.00%> (+0.59%) ⬆️
modules/git/blame.go 65.21% <0.00%> (+1.44%) ⬆️
modules/process/manager.go 82.94% <0.00%> (+1.55%) ⬆️

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 661d3d2...b61d8cc. Read the comment docs.

@zeripath zeripath merged commit 7960c96 into go-gitea:main Jan 16, 2022
@zeripath zeripath deleted the fix-18281-fix-expanding-diff branch January 16, 2022 09:31
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 17, 2022
* 'main' of https://github.com/go-gitea/gitea:
  show pull link for agit pull request also (go-gitea#18235)
  [skip ci] Updated translations via Crowdin
  Add some .ignore entries (go-gitea#18296)
  Remove unneeded debug messages to stdout. (go-gitea#18298)
  Handle missing default branch better in owner/repo/branches page (go-gitea#18290)
  Revert "Prevent possible XSS when using jQuery (go-gitea#18289)" (go-gitea#18293)
  not show double error response in git hook (go-gitea#18292)
  Remove accidental debugging in blob_excerpt.tmpl (go-gitea#18287)
  Prevent possible XSS when using jQuery (go-gitea#18289)
  Return nicer error if trying to pull from non-existent user (go-gitea#18288)
  [skip ci] Updated translations via Crowdin
  docs: mention client_max_body_size affects LFS (go-gitea#18291)
  Add lockfile-check (go-gitea#18285)
  Webauthn nits (go-gitea#18284)
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
* Remove accidental debugging in blob_excerpt.tmpl

Unfortunately it appears that a small bit of debugging code was left in blob_excerpt.tmpl
This breaks diff expansion causing go-gitea#18281.

Fix go-gitea#18281

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expanding diff view broken
5 participants