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.

Sign up for GitHub

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

Jump to bottom

Refactor "editorconfig" #26391

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Refactor "editorconfig" #26391

merged 2 commits into from
Aug 8, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Aug 8, 2023 •
edited
Loading

There are 2 kinds of ".Editorconfig" in code, one is JSON string for the web edtior, another is *editorconfig.Editorconfig for the file rendering (used by TabSizeClass)

This PR distinguish them with different names.

And by the way, change the default tab size from 8 to 4, I think few people would like to use 8-size tabs nowadays.

@wxiaoguang wxiaoguang added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Aug 8, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 8, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Aug 8, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 8, 2023
@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 Aug 8, 2023
@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 Aug 8, 2023
@wxiaoguang wxiaoguang enabled auto-merge (squash) August 8, 2023 10:12
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 8, 2023
@wxiaoguang wxiaoguang merged commit 4fc4f6e into go-gitea:main Aug 8, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 8, 2023
@wxiaoguang wxiaoguang deleted the refactor-editorconfig branch August 8, 2023 10:44
@silverwind
Copy link
Member

Would like to mention related issue #24991, just in case you have any idea where we are missing this context variable 😆.

zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 9, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
b842d2a 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  fix artifact merging chunks path with correct slash on Windows (go-gitea#26400)
  Use flex classes in package settings (go-gitea#26314)
  Improve multiple strings in en-US locale (go-gitea#26213)
  Refactor "editorconfig" (go-gitea#26391)
  fix generated source URL on rendered files (go-gitea#26364)
  Remove unnecessary template helper DisableGravatar (go-gitea#26386)
@tkuschel tkuschel mentioned this pull request Oct 3, 2023
Open
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @silverwind @lunny @delvh @GiteaBot