Skip to content

Fix editorconfig not respected in PR Conversation view#36492

Merged
silverwind merged 4 commits intomainfrom
copilot/fix-issue-24991
Jan 30, 2026
Merged

Fix editorconfig not respected in PR Conversation view#36492
silverwind merged 4 commits intomainfrom
copilot/fix-issue-24991

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Jan 30, 2026 •
edited by silverwind
Loading

Fixes: #24991

Tab size from .editorconfig was ignored in PR conversation view when rendering code comment diffs. Template called TabSizeClass $.Editorconfig but context data was nil.

Changes

Added SetEditorconfigIfExists middleware to routes missing it:

  • PR conversation view (/{username}/{reponame}/{type:pulls}/{index})
  • Issue view (/{username}/{reponame}/{type:issues}/{index})

This middleware loads .editorconfig and sets ctx.Data["Editorconfig"], already used correctly by Files tab and commit views.

// Before
m.Get("", repo.SetWhitespaceBehavior, repo.GetPullDiffStats, repo.ViewIssue)

// After  
m.Get("", repo.SetEditorconfigIfExists, repo.SetWhitespaceBehavior, repo.GetPullDiffStats, repo.ViewIssue)
Original prompt

Fix @go-gitea/gitea/issues/24991

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 30, 2026
@silverwind
Fix editorconfig not respected in PR Conversation view
0160e02 
Co-authored-by: silverwind <115237+silverwind@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix issue 24991 in Gitea Fix editorconfig not respected in PR Conversation view Jan 30, 2026
Copilot AI requested a review from silverwind January 30, 2026 06:15
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jan 30, 2026
wxiaoguang
wxiaoguang reviewed Jan 30, 2026
View reviewed changes
silverwind
silverwind reviewed Jan 30, 2026
View reviewed changes
@silverwind
Apply suggestion from @silverwind
9cfbec5 
Signed-off-by: silverwind <me@silverwind.io>
@silverwind
Copy link
Copy Markdown
Member

silverwind commented Jan 30, 2026

Tested it, works

image

@silverwind silverwind marked this pull request as ready for review January 30, 2026 08:36
@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 Jan 30, 2026
@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 Jan 30, 2026
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 30, 2026
@silverwind silverwind enabled auto-merge (squash) January 30, 2026 19:21
@silverwind silverwind disabled auto-merge January 30, 2026 19:21
@silverwind silverwind enabled auto-merge (squash) January 30, 2026 19:22
@silverwind silverwind disabled auto-merge January 30, 2026 19:23
@silverwind silverwind enabled auto-merge (squash) January 30, 2026 19:23
@silverwind silverwind disabled auto-merge January 30, 2026 19:24
@silverwind silverwind enabled auto-merge (squash) January 30, 2026 19:25
@silverwind silverwind merged commit 0acaad1 into main Jan 30, 2026
28 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Jan 30, 2026
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 30, 2026
@wxiaoguang wxiaoguang deleted the copilot/fix-issue-24991 branch February 1, 2026 09:07
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 1, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into mermaidelk
0d909d3 
* origin/main:
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 2, 2026
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
88d5608 
* giteaofficial/main: (26 commits)
  [skip ci] Updated translations via Crowdin
  Remove and forbid `@ts-expect-error` (go-gitea#36513)
  Add resolve/unresolve review comment API endpoints (go-gitea#36441)
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
  [SECURITY] Toolchain Update to Go 1.25.6 (go-gitea#36480)
  [skip ci] Updated translations via Crowdin
  Render merged pull request title as such in dashboard feed (go-gitea#36479)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 4, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into tabs
f0fa0e6 
* origin/main: (1246 commits)
  fix(packages/container): data race when uploading container blobs concurrently (go-gitea#36524)
  [skip ci] Updated translations via Crowdin
  Remove and forbid `@ts-expect-error` (go-gitea#36513)
  Add resolve/unresolve review comment API endpoints (go-gitea#36441)
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
  [SECURITY] Toolchain Update to Go 1.25.6 (go-gitea#36480)
  [skip ci] Updated translations via Crowdin
  ...

# Conflicts:
#	modules/templates/helper.go
#	options/locale/locale_en-US.ini
#	routers/web/repo/cherry_pick.go
#	routers/web/repo/editor.go
#	routers/web/repo/patch.go
#	templates/repo/editor/edit.tmpl
#	web_src/js/features/codeeditor.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@lunny lunny lunny approved these changes

+1 more reviewer

@silverwind silverwind silverwind approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@silverwind silverwind

Copilot code review Copilot

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Editorconfig not respected in PR Conversation view

5 participants

@silverwind @lunny @wxiaoguang @GiteaBot