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.

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

[release-2.9] fix: not using the default template when the custom template does not exist #4648

Merged

Conversation

halo-dev-bot
Copy link
Collaborator

This is an automated cherry-pick of #4618

/assign guqing

修复文章自定义模板不存在时没有使用默认模板的问题

@f2c-ci-robot f2c-ci-robot bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 22, 2023
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and LIlGG September 22, 2023 09:44
@JohnNiang JohnNiang added this to the 2.9.2 milestone Sep 22, 2023
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2023
@codecov
Copy link

codecov bot commented Sep 22, 2023

Codecov Report

Merging #4648 (c01e67a) into release-2.9 (12d25a4) will increase coverage by 0.00%.
The diff coverage is 91.66%.

@@              Coverage Diff               @@
##             release-2.9    #4648   +/-   ##
==============================================
  Coverage          61.11%   61.11%           
- Complexity          2566     2567    +1     
==============================================
  Files                373      373           
  Lines              13156    13158    +2     
  Branches             937      938    +1     
==============================================
+ Hits                8040     8042    +2     
  Misses              4663     4663           
  Partials             453      453           
Files Changed Coverage Δ
...va/run/halo/app/theme/router/ViewNameResolver.java 85.71% <91.66%> (+2.38%) ⬆️

Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023
@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Sep 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang, ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot merged commit 5a34fb5 into halo-dev:release-2.9 Sep 22, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants