Skip to content

Conversation

@zeripath
Copy link
Contributor

@zeripath zeripath commented Feb 10, 2022

There is a double encoding issue in branch template whereby the branch name
ends up double encoded.

Also remove Escape on issue.index in mail assignees

Fix #18709
Fix #18704

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

There is a double encoding issue in branch template whereby the branch name
ends up double encoded.

Fix go-gitea#18709

Signed-off-by: Andrew Thornton <[email protected]>
Signed-off-by: Andrew Thornton <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #18714 (5f07ce3) into main (165ab17) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #18714      +/-   ##
==========================================
- Coverage   46.44%   46.43%   -0.02%     
==========================================
  Files         851      851              
  Lines      121925   121925              
==========================================
- Hits        56630    56614      -16     
- Misses      58413    58431      +18     
+ Partials     6882     6880       -2     
Impacted Files Coverage Δ
modules/queue/queue_bytefifo.go 51.66% <0.00%> (-2.22%) ⬇️
modules/queue/workerpool.go 52.49% <0.00%> (-2.10%) ⬇️
modules/process/manager.go 81.36% <0.00%> (-1.87%) ⬇️
services/pull/pull.go 39.62% <0.00%> (-0.63%) ⬇️
models/repo_list.go 75.66% <0.00%> (-0.49%) ⬇️
routers/api/v1/repo/pull.go 45.04% <0.00%> (+0.37%) ⬆️
modules/queue/queue_channel.go 81.13% <0.00%> (+2.83%) ⬆️

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 165ab17...5f07ce3. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 10, 2022
Signed-off-by: Andrew Thornton <[email protected]>
@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 Feb 11, 2022
@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 Feb 11, 2022
@lunny
Copy link
Member

lunny commented Feb 11, 2022

make L-G-T-M work.

@lunny lunny merged commit b2b3225 into go-gitea:main Feb 11, 2022
@lunny
Copy link
Member

lunny commented Feb 11, 2022

Please send backport

zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 11, 2022
* giteaofficial/main:
  Prevent double encoding of branch names in delete branch (go-gitea#18714)
  [skip ci] Updated translations via Crowdin
  Attempt to improve docs (yet again) (go-gitea#18687)
  Make the proformas clearer that we need DEBUG logs (go-gitea#18700)
  Update SSH Server crypto settings (go-gitea#18697)
  Fix bug for version update hint (go-gitea#18701)
@zeripath zeripath deleted the fix-18709-prevent-double-encoding-in-branch-delete branch February 12, 2022 07:00
zeripath added a commit to zeripath/gitea that referenced this pull request Feb 12, 2022
)

Backport go-gitea#18714

* Prevent double encoding of branch names in delete branch

There is a double encoding issue in branch template whereby the branch name
ends up double encoded.

Fix go-gitea#18709

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

* and tag name

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

* And fix go-gitea#18704

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

Co-authored-by: Lunny Xiao <[email protected]>
@zeripath zeripath added the backport/done All backports for this PR have been created label Feb 12, 2022
zeripath added a commit that referenced this pull request Feb 12, 2022
…8738)

Backport #18714

* Prevent double encoding of branch names in delete branch

There is a double encoding issue in branch template whereby the branch name
ends up double encoded.

Fix #18709

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

* and tag name

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

* And fix #18704

Signed-off-by: Andrew Thornton <[email protected]>
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
)

* Prevent double encoding of branch names in delete branch

There is a double encoding issue in branch template whereby the branch name
ends up double encoded.

Fix go-gitea#18709

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

* and tag name

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

* And fix go-gitea#18704

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

Co-authored-by: Lunny Xiao <[email protected]>
@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

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.

Cannot delete branch with # in name Mail templating error when assigning PR

6 participants