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: remove automated contribution message #4131

Merged
merged 2 commits into from
Jun 27, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,8 @@ defaults:
{{ body | get_section("## Description", "") }}

Pull-Request: #{{ number }}.
{# Here comes some fancy Jinja2 stuff for correctly attributing co-authorship: #}
{%- set _ = 0 -%}
{%- for commit in commits -%}
{%- if commit.parents|length != 1 -%}
{%- set _ = commit.update({'merge': true}) -%}
{%- else -%}
{%- set _ = commit.update({'merge': false}) -%}
{%- endif -%}
{%- endfor -%}
{%- for commit in (commits | rejectattr("merge") | unique(False, 'email_author')) | rejectattr("author", "==", author) -%}
Co-authored-by: {{ commit.author }} <{{ commit.email_author }}>
{% endfor %}
{# GitHub requires that the `Co-authored-by` lines are AT THE VERY END of a commit, hence nothing must come after this. #}

{{ body | get_section("## Attributions", "") }}
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is only temporary so I am not too fussed.


pull_request_rules:
- name: Ask to resolve conflict
Expand Down