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

Display error log when a modified template has an error so that it could recovery when the error fixed #22261

Merged
merged 3 commits into from
Jan 3, 2023
Merged

Display error log when a modified template has an error so that it could recovery when the error fixed #22261

merged 3 commits into from
Jan 3, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 28, 2022

A drawback is the previous generated template has been cached, so you cannot get error in the UI but only from log

@lunny lunny added the type/enhancement An improvement of existing functionality label Dec 28, 2022
@lunny lunny requested a review from zeripath December 28, 2022 13:23
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (main@ca67c5a). Click here to learn what that means.
The diff coverage is 0.00%.

@@           Coverage Diff           @@
##             main   #22261   +/-   ##
=======================================
  Coverage        ?   48.11%           
=======================================
  Files           ?     1043           
  Lines           ?   142356           
  Branches        ?        0           
=======================================
  Hits            ?    68499           
  Misses          ?    65673           
  Partials        ?     8184
Impacted Files Coverage Δ
modules/templates/htmlrenderer.go 15.34% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 28, 2022
@KN4CK3R @delvh
Update modules/templates/htmlrenderer.go
824f209 
Co-authored-by: delvh <dev.lh@web.de>
@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 Dec 28, 2022
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Dec 29, 2022
@lunny lunny added this to the 1.19.0 milestone Jan 3, 2023
@lunny lunny added the outdated/backport/v1.18 This PR should be backported to Gitea 1.18 label Jan 3, 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 Jan 3, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 3, 2023
@lunny
Copy link
Member Author

lunny commented Jan 3, 2023

make L-G-T-M work

@lunny lunny merged commit c59e153 into go-gitea:main Jan 3, 2023
@lunny lunny deleted the lunny/watch_panic branch January 3, 2023 07:17
lunny added a commit to lunny/gitea that referenced this pull request Jan 3, 2023
@lunny @KN4CK3R @delvh
Display error log when a modified template has an error so that it co…
c5a89af 
…uld recovery when the error fixed (go-gitea#22261)

A drawback is the previous generated template has been cached, so you
cannot get error in the UI but only from log

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: delvh <dev.lh@web.de>
@lunny lunny mentioned this pull request Jan 3, 2023
Merged
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 3, 2023
lunny added a commit that referenced this pull request Jan 3, 2023
@lunny @KN4CK3R @delvh
Display error log when a modified template has an error so that it co…
791f290 
…uld recovery when the error fixed (#22261) (#22321)

backport #22261 

A drawback is the previous generated template has been cached, so you
cannot get error in the UI but only from log

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: delvh <dev.lh@web.de>
@lunny lunny added the backport/done All backports for this PR have been created label Jan 3, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 4, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
d1c7b74 
* upstream/main:
  fix: update settings table on install (go-gitea#22326)
  Use git command instead of exec.Cmd in blame (go-gitea#22098)
  Display error log when a modified template has an error so that it could recovery when the error fixed (go-gitea#22261)
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wolfogre wolfogre wolfogre approved these changes

@delvh delvh delvh approved these changes

@zeripath zeripath Awaiting requested review from zeripath

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.18 This PR should be backported to Gitea 1.18 skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.19.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lunny @codecov-commenter @wolfogre @delvh @GiteaBot @KN4CK3R