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

fix(pretty-date): plural form when the value is 1 (backport #20619) #20641

Merged
merged 1 commit into from
Apr 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2023

This is an automatic backport of pull request #20619 done by Mergify.
Cherry-pick of 6248d8f has failed:

On branch mergify/bp/version-13-hotfix/pr-20619
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 6248d8f062.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/utils/data.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team and shariquerik and removed request for a team April 11, 2023 05:27
@mergify mergify bot added the conflicts label Apr 11, 2023
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-20619 branch from 46c033c to 0a707e5 Compare April 11, 2023 05:35
@ankush ankush removed the conflicts label Apr 11, 2023
@ankush ankush merged commit 4d6b776 into version-13-hotfix Apr 11, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-20619 branch April 11, 2023 05:36
frappe-pr-bot pushed a commit that referenced this pull request Apr 11, 2023
# [13.53.0](v13.52.0...v13.53.0) (2023-04-11)

### Bug Fixes

* allow `reset_otp_secret` only if Two Factor Auth is enabled (backport [#20506](#20506)) ([#20560](#20560)) ([e8025a4](e8025a4))
* better permission error for query_report ([#20643](#20643)) ([#20646](#20646)) ([d972af8](d972af8))
* change z-index of freeze component to make it appear above all components ([1878b87](1878b87)), closes [#20538](#20538)
* child row form should be above freeze screen ([9201e84](9201e84))
* client script add to instead of replace ([0c7ac16](0c7ac16))
* client_script default value ([9ed7851](9ed7851))
* german translation of workflow state ([#20609](#20609)) ([#20615](#20615)) ([3769bdf](3769bdf))
* **grid row:** fix prettier hook check ([9309687](9309687))
* **grid row:** fix update_docfield_property function not updating grid row ([558f908](558f908))
* **ListView:** Evaluate sort_field sort_order within listviews based on DocTypes Definition ([#20482](#20482)) ([ba3cf84](ba3cf84))
* log requests even if no response ([#20638](#20638)) ([#20639](#20639)) ([ae4f7dd](ae4f7dd))
* no optional chaining in v13 ([d08627b](d08627b))
* **pretty-date:** plural form when the value is 1 ([#20619](#20619)) ([#20641](#20641)) ([4d6b776](4d6b776))
* validate if doctype exists before syncing customisations ([#20598](#20598)) ([#20644](#20644)) ([32ba65f](32ba65f))

### Features

* add context to confirm dailog ([0e21299](0e21299))
* add context to prompt dialog ([1bbf9c9](1bbf9c9))
* make report name translatable (backport [#20608](#20608)) ([#20617](#20617)) ([a92e69e](a92e69e))
* **minor:** log datetime in worker log (backport [#20414](#20414)) ([#20569](#20569)) ([dccb6af](dccb6af))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.53.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants