Skip to content

Fix EOL handling in web editor (#27141) #27234

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.

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

Merged
merged 2 commits into from
Sep 24, 2023

Conversation

GiteaBot
Copy link
Collaborator

Backport #27141 by @silverwind

Fixes #27136.

This does the following for Monaco's EOL setting:

  1. Use editorconfig setting if present
  2. Use the file's dominant line ending as detected by monaco, which uses LF for empty file

Fixes go-gitea#27136.

This does the following for Monaco's EOL setting:

1. Use editorconfig setting if present
2. Use the file's dominant line ending as detected by monaco, which uses
LF for empty file
@GiteaBot GiteaBot added type/bug topic/ui Change the appearance of the Gitea UI labels Sep 24, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Sep 24, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 24, 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 Sep 24, 2023
@silverwind silverwind enabled auto-merge (squash) September 24, 2023 20:30
@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 Sep 24, 2023
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 24, 2023
@silverwind silverwind merged commit a1029cb into go-gitea:release/v1.21 Sep 24, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 24, 2023
@testdasi
Copy link

This doesn't fix it. In fact, it's now worse. All my files are LF and when edit in browser, it always changes to Windows. This is very frustrating. Were the fixes tested at all?

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 24, 2023
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. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants