]> source.dussan.org Git - gitea.git/log
gitea.git
2 years agoImprove arc-green code theme (#21039) (#21042)
silverwind [Sat, 3 Sep 2022 17:51:09 +0000 (19:51 +0200)]
Improve arc-green code theme (#21039) (#21042)

Backport #21039

- Increase contrasts overall
- Add various missing theme classes
- Ensure strings and constants are colored the same across languages

2 years agoAdd down key check has tribute container (#21016) (#21038)
Tyrone Yeh [Sat, 3 Sep 2022 13:36:27 +0000 (21:36 +0800)]
Add down key check has tribute container (#21016) (#21038)

Backport #21016

Fixes an issue where users would not be able to select by pressing the down arrow when using @TAG above a message

Bug videos:

https://user-images.githubusercontent.com/1255041/188095999-c4ccde18-e53b-4251-8a14-d90c4042d768.mp4

2 years agoDo not add links to Posters or Assignees with ID < 0 (#20577) (#21037)
zeripath [Sat, 3 Sep 2022 12:51:10 +0000 (13:51 +0100)]
Do not add links to Posters or Assignees with ID < 0 (#20577) (#21037)

Backport #20577

There are several places in templates/repo/issue/view_content/comments.tmpl where links are made to Posters or Assignees who are Ghosts or have IDs <0.

Fix #20559

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoFix modified due date message (#20388) (#21032)
Lucas Azevedo [Fri, 2 Sep 2022 19:18:34 +0000 (16:18 -0300)]
Fix modified due date message (#20388) (#21032)

Backport #20388

2 years agoFix missed sort bug (#21006)
Lunny Xiao [Wed, 31 Aug 2022 15:40:29 +0000 (23:40 +0800)]
Fix missed sort bug (#21006)

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2 years agoFix input.value attr for RequiredClaimName/Value (#20946) (#21001)
John Olheiser [Wed, 31 Aug 2022 14:57:03 +0000 (09:57 -0500)]
Fix input.value attr for RequiredClaimName/Value (#20946) (#21001)

Values set for RequiredClaimName and RequiredClaimValue do not show up on UI.
Fix typo `values` to `value`.

Co-authored-by: soumyadey <soumya.dey@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agofix: remove redundant if (#20997)
Jason Song [Tue, 30 Aug 2022 21:16:33 +0000 (05:16 +0800)]
fix: remove redundant if (#20997)

2 years agoTranslations for repo buttons (#20834)
John Olheiser [Mon, 29 Aug 2022 14:37:53 +0000 (09:37 -0500)]
Translations for repo buttons (#20834)

* Translations

Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Update locale_de-DE.ini

* Update locales

Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
2 years agoFix download archiver of a commit (#20962) (#20971)
Lunny Xiao [Sun, 28 Aug 2022 11:29:34 +0000 (19:29 +0800)]
Fix download archiver of a commit (#20962) (#20971)

2 years agoChange review buttons to icons to make space for text (#20934) (#20978)
silverwind [Sat, 27 Aug 2022 20:52:00 +0000 (22:52 +0200)]
Change review buttons to icons to make space for text (#20934) (#20978)

The layout on the review code view was broken depending on length of the text. Change all three buttons to icons with tooltip to make more space for these long texts.

Fixes: #20922
2 years agoEnable contenthash in filename for dynamic assets (#20813) (#20932)
silverwind [Thu, 25 Aug 2022 06:16:20 +0000 (08:16 +0200)]
Enable contenthash in filename for dynamic assets (#20813) (#20932)

This should solve the main problem of dynamic assets getting stale after
a version upgrade. Everything not affected will use query-string based
cache busting, which includes files loaded via HTML or worker scripts.

2 years agoReturn 404 NotFound if requested attachment does not exist (#20886) (#20941)
zeripath [Thu, 25 Aug 2022 03:30:41 +0000 (04:30 +0100)]
Return 404 NotFound if requested attachment does not exist (#20886) (#20941)

Backport #20886

Add code to test if GetAttachmentByID returns an ErrAttachmentNotExist error
and return NotFound instead of InternalServerError

Fix #20884

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoDisable doctor logging on panic (#20847) (#20898)
zeripath [Wed, 24 Aug 2022 14:04:41 +0000 (15:04 +0100)]
Disable doctor logging on panic (#20847) (#20898)

Backport #20847

If permissions are incorrect for writing to the doctor log simply disable the log file
instead of panicing.

Related #20570

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: delvh <dev.lh@web.de>
2 years agoSet no-tags in git fetch on compare (#20893) (#20936)
zeripath [Tue, 23 Aug 2022 20:42:55 +0000 (21:42 +0100)]
Set no-tags in git fetch on compare (#20893) (#20936)

Backport #20893

In the compare endpoint the git fetch is restricted to a certain branch however,
this does not completely prevent tag acquisition/pollution as git fetch will collect
any tags on that branch.

This causes pollution of the tag namespace and could cause confusion by users.

This PR adds `--no-tags` to the `git fetch` call.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoIn PushMirrorsIterate and MirrorsIterate if limit is negative do not set it (#20837...
zeripath [Tue, 23 Aug 2022 16:38:52 +0000 (17:38 +0100)]
In PushMirrorsIterate and MirrorsIterate if limit is negative do not set it (#20837) (#20899)

Backport #20837

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years agoFix mirror address setting not working (#20850) (#20904)
zeripath [Tue, 23 Aug 2022 14:14:02 +0000 (15:14 +0100)]
Fix mirror address setting not working (#20850) (#20904)

Backport #20850

This patch fixes the issue that the mirror address field is ignored from the repo setting form.

Co-authored-by: Gary Wang <wzc782970009@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoAllow multiple metadata files for Maven packages (#20674) (#20916)
KN4CK3R [Tue, 23 Aug 2022 02:00:58 +0000 (04:00 +0200)]
Allow multiple metadata files for Maven packages (#20674) (#20916)

* Allow file overwrite for meta files.

* Added tests.

* lint

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years ago Don't open new page for ext wiki on same repository (#20725) (#20910)
Gusted [Mon, 22 Aug 2022 23:58:11 +0000 (01:58 +0200)]
 Don't open new page for ext wiki on same repository (#20725) (#20910)

* Don't open new page for ext wiki on same repository (#20725)

- Backport of #20725
  - When the external wiki has been set to a file on the repository, don't open the page on a tab.
  - Resolves #20657

* Gofmt

* Fix line

Co-authored-by: zeripath <art27@cantab.net>
2 years agoPad GPG Key ID with preceding zeroes (#20878) (#20885)
zeripath [Mon, 22 Aug 2022 18:35:18 +0000 (19:35 +0100)]
Pad GPG Key ID with preceding zeroes (#20878) (#20885)

Backport #20878

The go crypto library does not pad keyIDs to 16 characters with preceding zeroes. This
is a somewhat confusing thing for most users who expect these to have preceding zeroes.

This PR prefixes any sub 16 length KeyID with preceding zeroes and removes preceding
zeroes from KeyIDs inputted on the API.

Fix #20876

Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoIncrease Content field size of gpg_key and public_key to MEDIUMTEXT (#20896) (#20911)
zeripath [Mon, 22 Aug 2022 14:17:21 +0000 (15:17 +0100)]
Increase Content field size of gpg_key and public_key to MEDIUMTEXT (#20896) (#20911)

Backport #20896

Unfortunately some keys are too big to fix within the 65535 limit of TEXT on MySQL
this causes issues with these large keys.

Therefore increase these fields to MEDIUMTEXT.

Unfortunately the migration in #20896 cannot be backported to 1.17 so
affected users will have to use `gitea doctor recreate-table gpg_key public_key`

Fix #20894

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoFix push mirror address backend get error Address cause setting page display error...
zeripath [Mon, 22 Aug 2022 06:14:48 +0000 (07:14 +0100)]
Fix push mirror address backend get error Address cause setting page display error (#20593) (#20901)

2 years agoFix panic when an invalid oauth2 name is passed (#20820) (#20900)
zeripath [Mon, 22 Aug 2022 03:23:48 +0000 (04:23 +0100)]
Fix panic when an invalid oauth2 name is passed (#20820) (#20900)

2 years agoRemove calls to load Mirrors in user.Dashboard (#20855) (#20897)
zeripath [Mon, 22 Aug 2022 01:46:56 +0000 (02:46 +0100)]
Remove calls to load Mirrors in user.Dashboard (#20855) (#20897)

Backport #20855

Whilst looking at #20840 I noticed that the Mirrors data doesn't appear
to be being used therefore we can remove this and in fact none of the
related code is used elsewhere so it can also be removed.

Related #20840
Related #20804

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoFix SQL Query for `SearchTeam` (#20844) (#20872)
Gusted [Sun, 21 Aug 2022 18:31:51 +0000 (20:31 +0200)]
Fix SQL Query for `SearchTeam` (#20844) (#20872)

Backport #20844

Currently the function takes in the UserID option, but isn't being used within the SQL query. This patch fixes that by checking that only teams are being returned that the user belongs to.

Fix  #20829

2 years agoUpdate codemirror to 5.65.8 (#20875)
silverwind [Sun, 21 Aug 2022 16:25:46 +0000 (18:25 +0200)]
Update codemirror to 5.65.8 (#20875)

Includes fix for https://github.com/codemirror/codemirror5/issues/6893.

2 years agoDouble check CloneURL is acceptable (#20869) (#20892)
zeripath [Sun, 21 Aug 2022 14:42:48 +0000 (15:42 +0100)]
Double check CloneURL is acceptable (#20869) (#20892)

Backport #20869

Some Migration Downloaders provide re-writing of CloneURLs that may point to
unallowed urls. Recheck after the CloneURL is rewritten.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoEnsure that graceful start-up is informed of unused SSH listener (#20877)
JonRB [Sun, 21 Aug 2022 12:18:22 +0000 (13:18 +0100)]
Ensure that graceful start-up is informed of unused SSH listener (#20877)

The graceful manager waits for 4 listeners to be created or to be told that they are not needed. If it is not told about them it will indefinitely and timeout.

This leads to SVC hosts not being told of being in the readyState but on Unix would lead to the termination of the process.

There was an unfortunate regression in #20299 which missed this subtly and in the case whereby SSH is disabled the `builtinUnused()` is not called.

This PR adds a call to `builtinUnused()` when not using the builtin ssh to allow `createServerWaitGroup.Done()` to be called.

In addition it was noted that the if/else clauses for timeout informing of the SVC host were in the wrong order. These have been swapped.

Fix #20609

2 years agoRework repo buttons (#20602, #20718) (#20719)
silverwind [Sat, 20 Aug 2022 14:49:16 +0000 (16:49 +0200)]
Rework repo buttons (#20602, #20718) (#20719)

* Rework repo buttons (#20602)

* Rework repo buttons

- Replace "New PR" and "Go to File" button with Icon Button
- Move all "Add File" actions into a dropdown button
- Remove most custom styling of clone buttons
- Margin and wiki tweaks

Buttons are now all equal height, mobile layout wraps gracefully.

Fixes: https://github.com/go-gitea/gitea/issues/13671
Replaces: https://github.com/go-gitea/gitea/pull/20375

* Restore history button and hide add button when unable to add (#20718)

Fix two regressions from #20602:

- Restore the 'History' button that was previously unable to render
  because it's show condition was never hit
- Hide the 'Add File' button when there would be no items in the
  dropdown.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2 years agoFix the mode of custom dir to 0700 in docker-rootless (#20861) (#20867)
wxiaoguang [Sat, 20 Aug 2022 03:54:12 +0000 (11:54 +0800)]
Fix the mode of custom dir to 0700 in docker-rootless (#20861) (#20867)

2 years agoFix UI mis-align for PR commit history (#20845) (#20859)
wxiaoguang [Fri, 19 Aug 2022 08:54:33 +0000 (16:54 +0800)]
Fix UI mis-align for PR commit history (#20845) (#20859)

2 years agoupdate changelog v1.17.1
techknowlogick [Thu, 18 Aug 2022 19:34:24 +0000 (15:34 -0400)]
update changelog

2 years agoPrevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate...
zeripath [Thu, 18 Aug 2022 18:55:34 +0000 (19:55 +0100)]
Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848)

Backport #20621

Some repositories do not have the PullRequest unit present in their configuration
and unfortunately the way that IsUserAllowedToUpdate currently works assumes
that this is an error instead of just returning false.

This PR simply swallows this error allowing the function to return false.

Fix #20621

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoFix owners cannot create organization repos bug (#20841) (#20854)
zeripath [Thu, 18 Aug 2022 18:54:48 +0000 (19:54 +0100)]
Fix owners cannot create organization repos bug (#20841) (#20854)

Backport #20841

* Fix owners cannot create organization repos bug

* Fix api

* Update routers/api/v1/org/team.go

Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2 years agoChangelog 1.17.1 (#20833)
zeripath [Thu, 18 Aug 2022 18:52:04 +0000 (19:52 +0100)]
Changelog 1.17.1 (#20833)

* Changelog 1.17.1

 ## [1.17.1](https://github.com/go-gitea/gitea/releases/tag/1.17.1) - 2022-08-17

* SECURITY
  * Correctly escape within tribute.js (#20831) (#20832)
* FEATURES
  * Add support for NuGet API keys (#20721) (#20734)
* ENHANCEMENTS
  * Display project in issue list (#20583)
  * Add disable download source configuration (#20548) (#20579)
* BUGFIXES
  * Use the total issue count for UI (#20785) (#20827)
  * Add proxy host into allow list (#20798) (#20819)
  * Add missing translation for queue flush workers (#20791) (#20792)
  * Improve comment header for mobile (#20781) (#20789)
  * Fix git.Init for doctor sub-command (#20782) (#20783)
  * Check webhooks slice length before calling xorm (#20642) (#20768)
  * Remove manual rollback for failed generated repositories (#20639) (#20762)
  * Use correct field name in npm template (#20675) (#20760)
  * Keep download count on Container tag overwrite (#20728) (#20735)
  * Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)
  * Use request timeout for git service rpc (#20689) (#20693)
  * Send correct NuGet status codes (#20647) (#20677)
  * Use correct context to get package content (#20673) (#20676)
  * Fix the JS error "EventSource is not defined" caused by some non-standard browsers (#20584) (#20663)
  * Add default commit messages to PR for squash merge (#20618) (#20645)
  * Fix package upload for files >32mb (#20622) (#20635)
  * Fix the new-line copy-paste for rendered code (#20612)
  * Clean up and fix clone button script (#20415 & #20600) (#20599)
  *  Fix default merge style (#20564) (#20565)
  * Add repository condition for issue count (#20454) (#20496)
* MISC
  * Make branch icon stand out more (#20726) (#20774)
  * Fix loading button with invalid form (#20754) (#20759)
  * Add username check to doctor (#20140) (#20671)
  * Enable Wire 2 for Internal SSH Server (#20616) (#20617)
  *  Fix SecToTime edge-cases (#20610) (#20611)

Signed-off-by: Andrew Thornton <art27@cantab.net>
* Apply suggestions from code review

Co-authored-by: John Olheiser <john+github@jolheiser.com>
* Update CHANGELOG.md

Co-authored-by: delvh <dev.lh@web.de>
* Update CHANGELOG.md

* Update CHANGELOG.md

* update changelog

* Update CHANGELOG.md

Co-authored-by: John Olheiser <john+github@jolheiser.com>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: John Olheiser <john+github@jolheiser.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years agoCheck Mirror exists before linking its Repo (#20840) (#20842)
Lunny Xiao [Thu, 18 Aug 2022 08:57:40 +0000 (16:57 +0800)]
Check Mirror exists before linking its Repo (#20840) (#20842)

In MirrorRepositoryList.loadAttributes there is some code to load the Mirror entries
from the database. This assumes that every Repository which has IsMirror set has
a Mirror associated in the DB. This association is incorrect in the case of
Mirror repository under creation when there is no Mirror entry in the DB until
completion.

Unfortunately LoadAttributes makes this incorrect assumption and presumes that a
Mirror will always be loaded. This then causes a panic.

This PR simply double checks if there a Mirror before attempting to link back to
its Repo. Unfortunately it should be expected that there may be other cases where
this incorrect assumption causes further problems.

Fix #20804

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2 years agoAdd migrate repo archiver and packages storage support on command line (#20757) ...
Lunny Xiao [Thu, 18 Aug 2022 01:27:56 +0000 (09:27 +0800)]
Add migrate repo archiver and packages storage support on command line (#20757) (#20806)

* Add migrate repo archiver and packages storage support on command line (#20757)

* Add migrate repo archiver and packages storage support on command line

* Fix typo

* Use stdCtx

* Use packageblob and fix command description

* Add migrate packages unit tests

* Fix comment year

* Fix the migrate storage command line description

* Update cmd/migrate_storage.go

Co-authored-by: zeripath <art27@cantab.net>
* Update cmd/migrate_storage.go

Co-authored-by: zeripath <art27@cantab.net>
* Update cmd/migrate_storage.go

Co-authored-by: zeripath <art27@cantab.net>
* Fix test

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
* bug fix

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
2 years agoCheck issue labels slice length before calling xorm Insert(#20655) (#20836)
zeripath [Wed, 17 Aug 2022 22:36:56 +0000 (23:36 +0100)]
Check issue labels slice length before calling xorm Insert(#20655) (#20836)

Backport #20655

Fix #20654

Co-authored-by: Gabriel Vasile <gabriel.vasile@email.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years agoExecutable check always returns true for windows (#20637) (#20835)
zeripath [Wed, 17 Aug 2022 22:34:29 +0000 (23:34 +0100)]
Executable check always returns true for windows (#20637) (#20835)

Backport #20637

Windows doesn't have the concept of "executable" POSIX bits so for now always return true to minimise doctor and logging noise. Addresses #20636

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: JonRB <4564448+eeyrjmr@users.noreply.github.com>
Co-authored-by: silverwind <me@silverwind.io>
2 years agoCorrectly escape within tribute.js (#20831) (#20832)
zeripath [Wed, 17 Aug 2022 20:09:28 +0000 (21:09 +0100)]
Correctly escape within tribute.js (#20831) (#20832)

Backport #20831

When writing html in tribute.js ensure that strings are properly escaped.

Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoUse the total issue count for UI (#20785) (#20827)
parnic [Wed, 17 Aug 2022 17:25:07 +0000 (12:25 -0500)]
Use the total issue count for UI (#20785) (#20827)

Backport #20785

This fixes a problem where the "All" line item on the Issues or Pull Requests page was only showing the count of the selected repos instead of the total of all issues/prs in all repos.

The "total number of shown issues" number is now stashed in a different context variable in case it wants to be used by the frontend later. It's currently not being used.

Fixes #20574

2 years agofix merge (#20819)
Lunny Xiao [Wed, 17 Aug 2022 15:33:26 +0000 (23:33 +0800)]
fix merge (#20819)

2 years agoImprove comment header for mobile (#20781) (#20789)
Gusted [Mon, 15 Aug 2022 11:09:46 +0000 (11:09 +0000)]
Improve comment header for mobile (#20781) (#20789)

- Backport #20781
  - Since b9e8fa5 the avatar will be inlined into the comment header, so there's more room for the actual comment container(thus more text per line in the comment body). However this didn't take into consideration that the flex didn't allow any wrapping and thus was shrinking the avatar. Well this isn't a perfect solution, as you ideally all want these elements to be individually wrapped(such that comment-header-right can be on the same line as comment-header-left, which now causes a new line in certain situations). It's a better solution than the current CSS and to not mess with the desktop CSS/HTML.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoAdd missing translation for queue flush workers (#20791) (#20792)
Gusted [Sun, 14 Aug 2022 20:03:04 +0000 (20:03 +0000)]
Add missing translation for queue flush workers (#20791) (#20792)

- Backport #20791
  - Add a missing translation key and value for the flush worker indication
  - Resolves #20770

2 years agoFix git.Init for doctor sub-command (#20782) (#20783)
wxiaoguang [Sat, 13 Aug 2022 16:32:44 +0000 (00:32 +0800)]
Fix git.Init for doctor sub-command (#20782) (#20783)

2 years agoMake branch icon stand out more (#20726) (#20774)
Gusted [Fri, 12 Aug 2022 19:38:17 +0000 (19:38 +0000)]
Make branch icon stand out more (#20726) (#20774)

- Backport #20726
  - Currently the branch icon is "squashed" between the two branch names and feels a bit "amateur-ish" to my feeling(relative to other UI elements).
  - This patch tries to improve that by making the icon bigger and by adding some margin to not have a "squashed" icon.
  - This patch also includes a "fix", for some reason this symbol is not centering correctly. So apply allign-items: center to the top div

2 years agoAdd disable download source configuration (#20548) (#20579)
Lunny Xiao [Fri, 12 Aug 2022 15:53:10 +0000 (23:53 +0800)]
Add disable download source configuration (#20548) (#20579)

* Add disable download source configuration (#20548)

Add configuration to enable/disable download source from UI.

Co-authored-by: zeripath <art27@cantab.net>
* Fix BaseVars not used in renderering

* Fix disabled open in vscode menu when disabling download source from UI

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years agoCheck webhooks slice length before calling xorm (#20642) (#20768)
Lunny Xiao [Fri, 12 Aug 2022 08:36:45 +0000 (16:36 +0800)]
Check webhooks slice length before calling xorm (#20642) (#20768)

Fixes: #20641
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Gabriel Vasile <gabriel.vasile@email.com>
2 years agoRemove manual rollback for failed generated repositories (#20639) (#20762)
wxiaoguang [Thu, 11 Aug 2022 10:11:49 +0000 (18:11 +0800)]
Remove manual rollback for failed generated repositories (#20639) (#20762)

Generating repositories from a template is done inside a transaction.
Manual rollback on error is not needed and it always results in error
"repository does not exist".

Co-authored-by: Gabriel Vasile <gabriel.vasile@email.com>
2 years agoFix loading button with invalid form (#20754) (#20759)
silverwind [Thu, 11 Aug 2022 08:26:09 +0000 (10:26 +0200)]
Fix loading button with invalid form (#20754) (#20759)

Previously, if a invalid form was submitted (for example issue with no
title), the form could not be re-submitted again because the button
would not stay stuck in loading state. Fix that by hooking the 'submit'
event instead which triggers only when the form is valid.

2 years agoUse correct field name. (#20675) (#20760)
KN4CK3R [Thu, 11 Aug 2022 07:43:18 +0000 (09:43 +0200)]
Use correct field name. (#20675) (#20760)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoAdd support for NuGet API keys (#20721) (#20734)
KN4CK3R [Tue, 9 Aug 2022 21:56:18 +0000 (23:56 +0200)]
Add support for NuGet API keys (#20721) (#20734)

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years agoKeep download count on Container tag overwrite (#20728) (#20735)
KN4CK3R [Tue, 9 Aug 2022 15:33:45 +0000 (17:33 +0200)]
Keep download count on Container tag overwrite (#20728) (#20735)

Co-authored-by: 6543 <6543@obermui.de>
2 years agoFix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)
Lunny Xiao [Mon, 8 Aug 2022 15:58:11 +0000 (23:58 +0800)]
Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)

2 years ago Fix SecToTime edge-cases (#20610) (#20611)
Gusted [Mon, 8 Aug 2022 05:09:12 +0000 (05:09 +0000)]
 Fix SecToTime edge-cases (#20610) (#20611)

2 years agoUpdate issues.ref_closing_from in locale_ru-RU.ini (#20699)
Maxim Slipenko [Sun, 7 Aug 2022 10:32:07 +0000 (13:32 +0300)]
Update issues.ref_closing_from in locale_ru-RU.ini (#20699)

2 years agoUse request timeout for git service rpc (#20689) (#20693)
parnic [Sun, 7 Aug 2022 02:37:48 +0000 (21:37 -0500)]
Use request timeout for git service rpc (#20689) (#20693)

This enables git.Command's Run to optionally use the given context directly so its deadline will be respected. Otherwise, it falls back to the previous behavior of using the supplied timeout or a default timeout value of 360 seconds.

repo's serviceRPC() calls now use the context's deadline (which is unset/unlimited) instead of the default 6-minute timeout. This means that large repo clones will no longer arbitrarily time out on the upload-pack step, and pushes can take longer than 6 minutes on the receive-pack step.

Fixes #20680

2 years agoUse correct context to get package content (#20673) (#20676)
KN4CK3R [Fri, 5 Aug 2022 18:55:16 +0000 (20:55 +0200)]
Use correct context to get package content (#20673) (#20676)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoSend correct NuGet status codes (#20647) (#20677)
KN4CK3R [Fri, 5 Aug 2022 01:38:04 +0000 (03:38 +0200)]
Send correct NuGet status codes (#20647) (#20677)

* Fixed status codes.

* Fixed status codes.

2 years agoAdd username check to doctor (#20140) (#20671)
John Olheiser [Thu, 4 Aug 2022 16:07:07 +0000 (11:07 -0500)]
Add username check to doctor (#20140) (#20671)

* Add username check to doctor

- Add a new breaking change detector to Gitea's doctor, which checks if
all users still have a valid username according to Gitea. Given from
time-to-time we need to make changes, either due to new routes or due to
security, it's for a instance's admin to check if all users still have a
valid username.

* Fix extra argument

* Apply suggestions from code review

* Apply suggestions from code review

2 years agoFix the JS error "EventSource is not defined" caused by some non-standard browsers...
wxiaoguang [Thu, 4 Aug 2022 11:20:54 +0000 (19:20 +0800)]
Fix the JS error "EventSource is not defined" caused by some non-standard browsers (#20584) (#20663)

2 years agoAdd default commit messages to PR for squash merge (#20618) (#20645)
wxiaoguang [Thu, 4 Aug 2022 03:11:59 +0000 (11:11 +0800)]
Add default commit messages to PR for squash merge (#20618) (#20645)

Keep the same behavior as 1.16

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: Tyrone Yeh <tyrone_yeh@draytek.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2 years agoFix package upload for files >32mb (#20622) (#20635)
KN4CK3R [Tue, 2 Aug 2022 22:45:38 +0000 (00:45 +0200)]
Fix package upload for files >32mb (#20622) (#20635)

* Rewind file before first read.
* Added tests.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoAdjust line detection in highlight.go (#20612)
wxiaoguang [Tue, 2 Aug 2022 17:37:28 +0000 (01:37 +0800)]
Adjust line detection in highlight.go (#20612)

The code for detection of lines in highlight.go is somewhat too complex
and doesn't take account of how Chroma is actually splitting things into
lines for us.

Remove both the .line and .cl classes from Chroma's HTML which made
the old conditional work again. This fixed Copy of YAML files while also
reducing the amount of rendered HTML nodes.

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years agoDisplay project in issue list (#20583)
aceArt-GmbH [Tue, 2 Aug 2022 14:14:31 +0000 (16:14 +0200)]
Display project in issue list (#20583)

Co-authored-by: lukas <lukas.walter@aceart.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoEnable Wire 2 for Internal SSH Server (#20616) (#20617)
Gusted [Tue, 2 Aug 2022 07:58:57 +0000 (09:58 +0200)]
Enable Wire 2 for Internal SSH Server (#20616) (#20617)

- Backport of #20616
  - Git only decides to use the Wire 2 protocol when `git {receive,upload}-pack` receive the `GIT_PROTOCOL` environment with as value `version=2`. Currently the internal SSH Server wasn't passing this environment through. The `gitea serv` code already passed all received environments to the git command, so no code changes there.
  - This is mentioned in Git manual, https://git-scm.com/docs/git#Documentation/git.txt-codeGITPROTOCOLcode

2 years agoClean up and fix clone button script (#20415 & #20600) (#20599)
silverwind [Tue, 2 Aug 2022 04:31:38 +0000 (06:31 +0200)]
Clean up and fix clone button script (#20415 & #20600) (#20599)

* Clean up and fix clone button script (#20415)

The button 'primary' class needs to be set in a synchronous script to prevent flicker of the button which was regressed recently, fixed that.

Additionally, reduced the two script tags to just one, the previous scripts were actually initializing the buttons thrice on the empty repo page, now it only initializes once. Finally, removed duplicate code and re-used the inline function in the update code as well.

I had to split out the script into a separate template as on the empty repo page, the script needs access to the clone URL span in the example text, which is rendered below the clone buttons, so buttons and script could not be combined.

* Add default value for clone URLs

Default clone URLs to HTTP(S) in DOM rendering. JS will immediately
replace this if the user preference is SSH.

Fixes: https://github.com/go-gitea/gitea/issues/20558
2 years agoFix default merge style for pull requests (#20564) (#20565)
wxiaoguang [Sun, 31 Jul 2022 14:41:06 +0000 (22:41 +0800)]
Fix default merge style for pull requests (#20564) (#20565)

2 years agoChangelog v1.17.0 (#20541) v1.17.0
6543 [Sat, 30 Jul 2022 19:08:25 +0000 (21:08 +0200)]
Changelog v1.17.0 (#20541)

2 years agoWebAuthn CredentialID field needs to be increased in size (#20530) (#20555)
6543 [Sat, 30 Jul 2022 18:16:25 +0000 (20:16 +0200)]
WebAuthn CredentialID field needs to be increased in size (#20530) (#20555)

WebAuthn have updated their specification to set the maximum size of the
CredentialID to 1023 bytes. This is somewhat larger than our current
size and therefore we need to migrate.

The PR changes the struct to add CredentialIDBytes and migrates the CredentialID string
to the bytes field before another migration drops the old CredentialID field. Another migration
renames this field back.

Fix #20457

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2 years agoRework raw file http header logic (#20484) (#20542)
silverwind [Sat, 30 Jul 2022 16:37:02 +0000 (18:37 +0200)]
Rework raw file http header logic (#20484) (#20542)

- Always respect the user's configured mime type map
- Allow more types like image/pdf/video/audio to serve with correct content-type
- Shorten cache duration of raw files to 5 minutes, matching GitHub
- Don't set `content-disposition: attachment`, let the browser decide whether it wants to download or display a file directly
- Implement rfc5987 for filenames, remove previous hack. Confirmed it working in Safari.
- Make PDF attachment work in Safari by removing `sandbox` attribute.

This change will make a lot more file types open directly in browser now. Logic should generally be more readable than before with less `if` nesting and such.

Replaces: https://github.com/go-gitea/gitea/pull/20460
Replaces: https://github.com/go-gitea/gitea/pull/20455
Fixes: https://github.com/go-gitea/gitea/issues/20404
2 years agoAdd Docker /v2/_catalog endpoint (#20469) (#20556)
6543 [Sat, 30 Jul 2022 15:52:04 +0000 (17:52 +0200)]
Add Docker /v2/_catalog endpoint (#20469) (#20556)

* Added properties for packages.
* Fixed authenticate header format.
* Added _catalog endpoint.
* Check owner visibility.
* Extracted condition.
* Added test for _catalog.

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2 years agoUpdate notification count for non-mobile version (#20544)
Gusted [Sat, 30 Jul 2022 02:28:48 +0000 (04:28 +0200)]
Update notification count for non-mobile version (#20544)

- Since #20108 we have two version of the notification bell, one for
mobile the other for non-mobile. However the code only accounts for one
notification count and thus was only updating the non-mobile one.
- This code fixes that by applying the code for all `.notification_count`s.
- Frontport will be in #20543

2 years agoAdd missing Tabs on organisation/package view (#20539)
6543 [Fri, 29 Jul 2022 17:14:50 +0000 (19:14 +0200)]
Add missing Tabs on organisation/package view (#20539)

hotfix #20106

2 years agoEnsure that all unmerged files are merged when conflict checking (#20528) (#20536)
6543 [Fri, 29 Jul 2022 13:37:18 +0000 (15:37 +0200)]
Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)

There is a subtle bug in the code relating to collating the results of
`git ls-files -u -z` in `unmergedFiles()`. The code here makes the
mistake of assuming that every unmerged file will always have a stage 1
conflict, and this results in conflicts that occur in stage 3 only being
dropped.

This PR simply adjusts this code to ensure that any empty unmergedFile
will always be passed down the channel.

The PR also adds a lot of Trace commands to attempt to help find future
bugs in this code.

Fix #19527

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2 years agoUpdate lunny/levelqueue to prevent NPE when reads are performed after close (#20534...
6543 [Fri, 29 Jul 2022 12:58:56 +0000 (14:58 +0200)]
Update lunny/levelqueue to prevent NPE when reads are performed after close (#20534) (#20537)

Co-authored-by: zeripath <art27@cantab.net>
2 years agoStop logging EOFs and exit(1)s in ssh handler (#20476) (#20529)
zeripath [Fri, 29 Jul 2022 00:10:42 +0000 (01:10 +0100)]
Stop logging EOFs and exit(1)s in ssh handler (#20476) (#20529)

Backport #20476

The code in modules/ssh/ssh.go:sessionHandler() currently cause an error to be
logged if `gitea serv` exits with a exit(1). This logging is useless because the
accompanying stderr is not provided and in any case the exit(1) is most likely due
to permissions errors.

Further it then causes the EOF to be logged - even though this is not helpful.

This PR simply checks the errors returned and stops logging them.

In the case of misconfigurations causing `gitea serv` to fail with exit(1)
the current logging is not helpful at determining this and users should simply
review the message passed over the ssh connection.

Fix #20473

Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agopackages/generic: Do not restrict package versions to SemVer (#20414) (#20531)
6543 [Thu, 28 Jul 2022 23:17:56 +0000 (01:17 +0200)]
packages/generic: Do not restrict package versions to SemVer (#20414) (#20531)

There are existing packages out there whose version do not conform to SemVer, yet, one would like to have them available in a generic package repository. To this end, remove the SemVer restriction on package versions when using the Generic package registry, and replace it with a check that simply makes sure the version isn't empty.

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Gergely Nagy <algernon@users.noreply.github.com>
2 years agoAdd labels to two buttons that were missing them (#20419) (#20524)
6543 [Thu, 28 Jul 2022 20:21:36 +0000 (22:21 +0200)]
Add labels to two buttons that were missing them (#20419) (#20524)

Backport #20419

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years agoAllow non-semver packages in the Conan package registry (#20412) (#20523)
6543 [Thu, 28 Jul 2022 20:19:56 +0000 (22:19 +0200)]
Allow non-semver packages in the Conan package registry (#20412) (#20523)

Backport #20412

A lot of existing packages do not conform to SemVer, yet, they should be allowed
in the Conan package registry as-is. To achieve this, remove the SemVer check
from `NewRecipeReference`, and replace it with a simple empty string check.

A unit test with a non-semver version is also included.

Fixes #20405.

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Gergely Nagy <algernon@users.noreply.github.com>
2 years agoFix possible panic when repository is empty (#20509) (#20526)
6543 [Thu, 28 Jul 2022 20:18:49 +0000 (22:18 +0200)]
Fix possible panic when repository is empty (#20509) (#20526)

Backport #20509

2 years agoFix Ruby package parsing by removed unused email field (#20470) (#20525)
6543 [Thu, 28 Jul 2022 18:41:57 +0000 (20:41 +0200)]
Fix Ruby package parsing by removed unused email field (#20470) (#20525)

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
2 years agoFix dashboard switching on Mobile (#20238) (#20239)
Gusted [Thu, 28 Jul 2022 17:04:29 +0000 (19:04 +0200)]
Fix dashboard switching on Mobile (#20238) (#20239)

- This is a regression of improving mobile experience on Gitea, currently organization dashboard aren't readable and the popup won't show up when you want to switch between users/organization(as we saw in #19978).
- This patch fixes that, by allowing the popup to allocate the required pixels(for some absurd reason, z-index doesn't work on the popup, so it's not able to render over the existing elements, we can investigate later of why this is). And also remove the additional dropdown menu for the pages link, so it's one unified list which then can be displayed as rows.

2 years agoFix package permission checks for organizations (#20517) (#20520)
KN4CK3R [Thu, 28 Jul 2022 14:05:59 +0000 (16:05 +0200)]
Fix package permission checks for organizations (#20517) (#20520)

2 years agoFix ROOT_URL detection for URLs without trailing slash (#20503)
wxiaoguang [Wed, 27 Jul 2022 15:49:01 +0000 (23:49 +0800)]
Fix ROOT_URL detection for URLs without trailing slash (#20503)

2 years agoShow hint to link package to repo when viewing empty repo package list (#20504) ...
Norwin [Wed, 27 Jul 2022 14:06:54 +0000 (16:06 +0200)]
Show hint to link package to repo when viewing empty repo package list (#20504) (#20507)

2 years agoModify milestone search keywords to be case insensitive (#20266) (#20498)
Tyrone Yeh [Wed, 27 Jul 2022 11:55:09 +0000 (19:55 +0800)]
Modify milestone search keywords to be case insensitive (#20266) (#20498)

* Modify milestone search keywords to be case insensitive (#20266)

Milestone search keywords are now sensitive, this modification is changed to insensitive

* Modify for #18437

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2 years agoAdd repository condition for issue count (#20496)
Tyrone Yeh [Wed, 27 Jul 2022 06:09:25 +0000 (14:09 +0800)]
Add repository condition for issue count (#20496)

2 years agofix enabling repo packages when projects are off (#20486) (#20488)
Norwin [Tue, 26 Jul 2022 14:50:45 +0000 (16:50 +0200)]
fix enabling repo packages when projects are off (#20486) (#20488)

2 years agoAdd Cache-Control header to html and api responses, add no-transform (#20432) (#20459)
silverwind [Sat, 23 Jul 2022 10:58:58 +0000 (12:58 +0200)]
Add Cache-Control header to html and api responses, add no-transform (#20432) (#20459)

`no-transform` allegedly disables CloudFlare auto-minify and we did not
set caching headers on html or api requests, which seems good to have
regardless.

Transformation is still allowed for asset requests.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
2 years agoDismiss prior pull reviews if done via web in review dismiss (#20197) (#20407)
6543 [Tue, 19 Jul 2022 15:46:33 +0000 (17:46 +0200)]
Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407)

2 years agoChangelog v1.17.0-rc2 (#20350) v1.17.0-rc2
6543 [Tue, 19 Jul 2022 13:43:24 +0000 (15:43 +0200)]
Changelog v1.17.0-rc2 (#20350)

Co-authored-by: zeripath <art27@cantab.net>
2 years agoAllow RSA 2047 bit keys (#20272) (#20396)
zeripath [Mon, 18 Jul 2022 14:30:01 +0000 (15:30 +0100)]
Allow RSA 2047 bit keys (#20272) (#20396)

Backport #20272

Unfortunately it appears that 2048 bit RSA keys can occasionally be created in such
a way that they appear to have 2047 bit length. This PR simply changes our defaults to
allow these.

Fix #20249

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2 years agoAdd missing return for when topic isn't found (#20351) (#20395)
zeripath [Mon, 18 Jul 2022 02:16:58 +0000 (03:16 +0100)]
Add missing return for when topic isn't found (#20351) (#20395)

2 years agoFix commit status icon when in subdirectory (#20285) (#20385)
silverwind [Sat, 16 Jul 2022 12:54:49 +0000 (14:54 +0200)]
Fix commit status icon when in subdirectory (#20285) (#20385)

When viewing a subdirectory and the latest commit to that directory in
the table, the commit status icon incorrectly showed the status of the
HEAD commit instead of the latest for that directory.

2 years agoSet target on create release with existing tag (#20381) (#20382)
Gusted [Fri, 15 Jul 2022 18:39:48 +0000 (18:39 +0000)]
Set target on create release with existing tag (#20381) (#20382)

When you create a new release(e.g. via Tea) and specify a tag that already exists on the repository, Gitea will instead use the `UpdateRelease` functionality. However it currently doesn't set the Target field. This PR fixes that.

2 years agoInitialize cron last (#20373) (#20384)
zeripath [Fri, 15 Jul 2022 17:44:22 +0000 (18:44 +0100)]
Initialize cron last (#20373) (#20384)

Backport #20373

Cron will try to run certain things at startup but these depend on multiple things
being set-up. Therefore we should initialize cron last.

Signed-off-by: Andrew Thornton <art27@cantab.net>
2 years agoMake sure `repo_dir` is an empty directory or doesn't exist before 'dump-repo' (...
6543 [Fri, 15 Jul 2022 03:12:52 +0000 (05:12 +0200)]
Make sure `repo_dir` is an empty directory or doesn't exist before 'dump-repo' (#20205) (#20370)

Co-authored-by: a1012112796 <1012112796@qq.com>
2 years agoupdate xorm.io/xorm v1.3.2-0.20220714055524-c3bce556200f (#20371) (#20372)
6543 [Thu, 14 Jul 2022 16:42:23 +0000 (18:42 +0200)]
update xorm.io/xorm v1.3.2-0.20220714055524-c3bce556200f (#20371) (#20372)

Backport #20371

Xorm 1.3.2-0.20220714055524 contains a fix for interpreting db column sizes. Prior to this fix xorm would assume that the size of a column was within the range of an `int`. This is correct on 64bit machines where `int` is typical equivalent to `int64` however, on 32bit machines `int` tends to be `int32`.

Unfortunately the size of a LONGTEXT field is actually `max_uint32`, thus using `strconv.Atoi` on these fields will fail and thus #20161 occurs on 32 bit arm. Xorm 1.3.2-0.20220714055524 changes this field to use int64 instead.

Fix  #20161

2 years agoPrevent context deadline error propagation in GetCommitsInfo (#20346) (#20361)
6543 [Thu, 14 Jul 2022 02:44:34 +0000 (04:44 +0200)]
Prevent context deadline error propagation in GetCommitsInfo (#20346) (#20361)

Backport #20346

Although `WalkGitLog` tries to test for `context.DeadlineExceededErr`
there is a small chance that the error will propagate to the reader
before it is recognised. This will cause the error to propagate up to
`renderDirectoryFiles` and cause a http status 500.

Here we check that the error passed is a `DeadlineExceededErr` via error.Is

Fix #20329

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2 years agoFix org label open count, including close count issue (#20364)
Tyrone Yeh [Thu, 14 Jul 2022 02:42:46 +0000 (10:42 +0800)]
Fix org label open count, including close count issue (#20364)