Merge different languages for language stats (#24900) #24921
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix go-gitea#24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300`
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
lunny
approved these changes
May 25, 2023
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
May 25, 2023
GiteaBot
added
lgtm/done
silverwind
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
Codeberg-org
pushed a commit
to Codeberg-org/gitea
that referenced
this pull request
Jun 3, 2023
…ea#24921) Backport go-gitea#24900 Fix go-gitea#24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300` (cherry picked from commit a83d597)
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #24900
Fix #24896
If users set different languages by
linguist-language, thestatsmap could be:java: 100, Java: 200.Language stats are stored as case-insensitive in database and there is a unique key.
So, the different language names should be merged to one unique name:
Java: 300