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

feat(core): disallow enabling template and journal together #9722

Open
wants to merge 2 commits into
base: canary
Choose a base branch
from

Conversation

CatsJuice
Copy link
Member

@CatsJuice CatsJuice commented Jan 16, 2025

close AF-2125

feat(core): disallow enabling template and journal together
test(core): should not allow to set template and journal at the same time

@github-actions github-actions bot added mod:i18n Related to i18n test Related to test cases app:core labels Jan 16, 2025
Copy link
Member Author

CatsJuice commented Jan 16, 2025


How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • merge - adds this PR to the back of the merge queue
  • hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@CatsJuice CatsJuice marked this pull request as ready for review January 16, 2025 03:49
Copy link

codecov bot commented Jan 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.09%. Comparing base (c2149f2) to head (e0505e1).
Report is 1 commits behind head on canary.

Additional details and impacted files
@@            Coverage Diff             @@
##           canary    #9722      +/-   ##
==========================================
+ Coverage   53.05%   53.09%   +0.03%     
==========================================
  Files        2183     2183              
  Lines       98127    98127              
  Branches    16688    16687       -1     
==========================================
+ Hits        52065    52099      +34     
- Misses      44172    44659     +487     
+ Partials     1890     1369     -521     
Flag Coverage Δ
server-test 78.14% <ø> (ø)
unittest 32.09% <ø> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@CatsJuice CatsJuice force-pushed the catsjuice/feat/journal-template-conflict branch from 8dcf766 to e0505e1 Compare January 17, 2025 02:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app:core mod:i18n Related to i18n test Related to test cases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant