Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Allow feature builtins to overwrite existing builtins (bp #13403)#13420

Merged
mergify[bot] merged 1 commit into
v1.4from
mergify/bp/v1.4/pr-13403
Nov 5, 2020
Merged

Allow feature builtins to overwrite existing builtins (bp #13403)#13420
mergify[bot] merged 1 commit into
v1.4from
mergify/bp/v1.4/pr-13403

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 5, 2020

This is an automated backport of pull request #13403 done by Mergify

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.io/

* Allow feature builtins to overwrite existing builtins

* Add feature_builtin ActivationType

* Correctly retain idempotent for replacing case

* Fix test

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
(cherry picked from commit bc62313)
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Nov 5, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 5, 2020

Codecov Report

Merging #13420 into v1.4 will increase coverage by 0.0%.
The diff coverage is 90.9%.

@@          Coverage Diff           @@
##            v1.4   #13420   +/-   ##
======================================
  Coverage   81.9%    81.9%           
======================================
  Files        376      376           
  Lines      87865    87913   +48     
======================================
+ Hits       72024    72072   +48     
  Misses     15841    15841           

@mergify mergify Bot merged commit b15d826 into v1.4 Nov 5, 2020
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-13403 branch November 5, 2020 16:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant