Skip to content

📝 update Code of Conduct materials to match current policies #2563

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.

Sign up for GitHub

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

Open
dryan wants to merge 6 commits into
base: main
Choose a base branch
from
Open

📝 update Code of Conduct materials to match current policies #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38b327e
📝 update Code of Conduct materials to match current policies
dryan Mar 16, 2026
499b321
📝 update Code of Conduct materials to match current policies (fix DJh…
dryan Mar 16, 2026
e427f21
📝 update Code of Conduct materials to match current policies (fix url…
dryan Mar 16, 2026
81c3417
Merge branch 'main' into main
dryan Mar 24, 2026
9175003
Merge branch 'main' into main
dryan Mar 27, 2026
bba2f58
Merge branch 'main' into main
dryan Mar 30, 2026
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
19 changes: 14 additions & 5 deletions djangoproject/templates/conduct/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,32 @@ <h2 id="aside-header">{% translate "Django Community Code of Conduct" %}</h2>
<li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Code of Conduct working group" %}</a></li>
<li><a href="{% url 'conduct_faq' %}">{% translate "Frequently Asked Questions" %}</a></li>
<li><a href="{% url 'conduct_reporting' %}">{% translate "Reporting Guide" %}</a></li>
<li><a href="{% url 'conduct_enforcement' %}">{% translate "Enforcement Manual" %}</a></li>
<li><a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md">{% translate "Enforcement Manual" %}</a></li>
<li><a href="{% url 'conduct_changes' %}">{% translate "Changes" %}</a></li>
</ul>

<h3>{% translate "License" %}</h3>
<p>
{% blocktranslate trimmed %}
All content on this page is licensed under a
<a href="https://creativecommons.org/licenses/by/3.0/">Creative Commons
Attribution </a> license.
<a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons
Attribution-ShareAlike </a> license.
{% endblocktranslate %}
</p>
<p>
<a href="https://creativecommons.org/licenses/by/3.0/">
<img src="https://i.creativecommons.org/l/by/3.0/88x31.png" height="31" width="88" alt="CC-by">
<a href="https://creativecommons.org/licenses/by-sa/4.0/">
<img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" height="31" width="88" alt="CC-by-sa">
</a>
</p>

<h3>{% translate "Sources" %}</h3>
<p>
{% blocktranslate trimmed %}
Our documents and policies are adapted from and inspired by
<a href="https://github.com/django/code-of-conduct/blob/main/sources.md">a
number of sources</a>.
{% endblocktranslate %}
</p>
</div>
{% endblock %}

Expand Down
43 changes: 10 additions & 33 deletions djangoproject/templates/conduct/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ <h2>{% translate "Change control process" %}</h2>
We're (mostly) programmers, so we'll track changes to the code of conduct and
associated documents the same way we track changes to code. All changes will
be proposed via a pull request to the
<a href="https://github.com/django/djangoproject.com">djangoproject.com repository
on GitHub</a>. Changes will be reviewed by the conduct working group first, and then
sent to the DSF and the Django community for comment.
We'll hold a comment period of at least one week, then the DSF board will vote on
the change. Approved changes will be merged, published, and noted below.{% endblocktranslate %}</p>
<a href="https://github.com/django/code-of-conduct">Django Code of Conduct
repository on GitHub</a>. Changes will be reviewed by the code of conduct
working group first, and then sent to the DSF and the Django community for
comment. We'll hold a comment period of at least one month. Changes to the Code
of Conduct itself will be voted on by the DSF board; other documentation changes
will be approved by the code of conduct working group. Approved changes will be
merged, published, and noted in <a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">
our changelog</a>.{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
Expand All @@ -30,33 +33,7 @@ <h2>{% translate "Change control process" %}</h2>
<p>
{% blocktranslate trimmed %}
A complete list of changes can always be found
<a href="https://github.com/django/djangoproject.com/commits/main/templates/conduct">on GitHub</a>;
major changes and releases are summarized below.{% endblocktranslate %}</p>

<h2>{% translate "Changelog" %}</h2>

<dl>
<dt>{% isodate "2014-10-03" %}</dt>
<dd>
{% blocktranslate trimmed %}
<a href="https://github.com/django/djangoproject.com/commit/577a02bbe968de79f8e111d6139f0c1299e994e9">
Revised text</a> to clarify that behavior outside the community is a contributing factor to involvement in the
Django community; and explicitly provided a non-exhaustive list of diversity groups we consider included under the policy.
{% endblocktranslate %}</dd>

<dt>{% isodate "2013-07-31" %}</dt>
<dd>{% translate "Documents approved and officially published." %}</dd>

<dt>{% isodate "2013-07-15" %}</dt>
<dd><a href="https://github.com/django/djangoproject.com/commit/ae21fb5cb1f7edfca5b5556d92fb86186d92aeb3">
{% blocktranslate trimmed %}
Added the reporting guide and enforcement manual</a>. Final draft presented
to the board and core membership for vote.{% endblocktranslate %}</dd>

<dt>{% isodate "2013-04-01" %}</dt>
<dd><a href="https://github.com/django/djangoproject.com/commit/1a0aae11a331bfbf36d6f4091d77413b780454e5">
{% blocktranslate trimmed %}Initial "beta" release and public call for comments{% endblocktranslate %}</a>.</dd>

</dl>
<a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">on
GitHub</a>.{% endblocktranslate %}</p>

{% endblock %}
184 changes: 3 additions & 181 deletions djangoproject/templates/conduct/enforcement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,185 +11,7 @@ <h1>{% translate "Django Code of Conduct - Enforcement Manual" %}</h1>

<h2 class="deck">
{% blocktranslate trimmed %}
This is the enforcement manual followed by Django's Code of
Conduct working group. It's used when we respond to an issue to make sure we're
consistent and fair. It should be considered an internal document, but we're
publishing it publicly in the interests of transparency.
{% endblocktranslate %}</h2>

<h3>{% translate "The Code of Conduct Working Group" %}</h3>

<p>
{% url 'members:teams' as teams_url %}
{% blocktranslate trimmed %}
All responses to reports of conduct violations will be managed by the
<a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct working group</a>.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The Django Software Foundation's Board of Directors ("the board") will establish
this working group, comprised of at least three members. One member will be
designated chair of the working group and will be responsible for all reports back to
the board. The board will review membership on a regular basis.
{% endblocktranslate %}</p>

<h3>{% translate "How the working group will respond to reports" %}</h3>

<p>
{% blocktranslate trimmed %}
When a report is sent to the working group they will immediately reply to the
report to confirm receipt. This reply must be sent within 24 hours, and the
working group should strive to respond much quicker than that.
{% endblocktranslate %}</p>

{% url 'conduct_reporting' as conduct_reporting %}
<p>
{% blocktranslate trimmed %}
See the <a href="{{ conduct_reporting }}">reporting guidelines</a> for details of
what reports should contain. If a report doesn't contain enough information, the
working group will obtain all relevant data before acting. The working group is
empowered to act on the DSF's behalf in contacting any individuals involved to
get a more complete account of events.
{% endblocktranslate %}</p>

<p>{% translate "The working group will then review the incident and determine, to the best of their ability:" %}
<ul>
<li>{% translate "what happened" %}</li>
<li>{% translate "whether this event constitutes a code of conduct violation" %}</li>
<li>{% translate "who, if anyone, was the bad actor" %}</li>
<li>{% translate "whether this is an ongoing situation, and there is a threat to anyone's physical safety" %}</li>
</ul>
</p>

<p>
{% blocktranslate trimmed %}
This information will be collected in writing, and whenever possible the
working group's deliberations will be recorded and retained (i.e. chat transcripts, email
discussions, recorded voice conversations, etc).
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The working group should aim to have a resolution agreed upon within one week.
In the event that a resolution can't be determined in that time, the working group will
respond to the reporter(s) with an update and projected timeline for resolution.
{% endblocktranslate %}</p>

<h3>{% translate "Acting Unilaterally" %}</h3>

<p>
{% blocktranslate trimmed %}
If the act is ongoing (such as someone engaging in harassment on the forum), or involves
a threat to anyone's safety (e.g. threats of violence), any working group member
may act immediately (before reaching consensus) to end the situation. In ongoing
situations, any member may at their discretion employ any of the tools available
to the working group, including bans and blocks.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
If the incident involves physical danger, any member of the working group may --
and should -- act unilaterally to protect safety. This can include contacting
law enforcement (or other local personnel) and speaking on behalf of the DSF.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
In situations where an individual working group member acts unilaterally, they must
report their actions to the working group for review within 24 hours.{% endblocktranslate %}</p>

<h3>{% translate "Resolutions" %}</h3>

<p>
{% blocktranslate trimmed %}
The working group must agree on a resolution by consensus. If the working group cannot
reach consensus and deadlocks for over a week, the working group will turn the matter
over to the board for resolution.{% endblocktranslate %}</p>

<p>{% translate "Possible responses may include:" %}
<ul>
<li>{% translate "Taking no further action (if we determine no violation occurred)." %}</li>
<li>
{% blocktranslate trimmed %}
A private reprimand from the working group to the individual(s) involved.
In this case, a working group member will deliver that reprimand to the individual(s)
over email, cc'ing the working group.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A public reprimand. In this case, a working group member will deliver that reprimand
in the same venue that the violation occurred (i.e. in the forum for a forum violation;
email for an email violation, etc.). The working group may choose to publish this message
elsewhere for posterity.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
An imposed vacation (i.e. asking someone to "take a week off" from the forum).
A working group member will communicate this "vacation" to the individual(s).
They'll be asked to take this vacation voluntarily, but if they don't agree then
a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A permanent or temporary ban from some or all Django spaces (the forum,
etc.). The working group will maintain records of all such bans so that they may be
reviewed in the future, extended to new Django fora, or otherwise maintained.
{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A request for a public or private apology. a working group member will deliver this request.
The working group may, if it chooses, attach "strings" to this request: for example,
the working group may ask a violator to apologize in order to retain his or her membership
on the forum.{% endblocktranslate %}</li>
</ul>
</p>

<p>
{% blocktranslate trimmed %}
Once a resolution is agreed upon, but before it is enacted, the working group
will contact the original reporter and any other affected parties and explain
the proposed resolution. The working group will ask if this resolution is
acceptable, and must note feedback for the record. However, the working group is
not required to act on this feedback.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
Finally the working group will make a report for the DSF board. In case the
incident or report involves a current member of the board, the working group will
provide the report only to the other board members.
{% endblocktranslate %}</p>

<p>
{% blocktranslate trimmed %}
The working group will never publicly discuss the issue; all public statements
will be made by the DSF board.
{% endblocktranslate %}</p>

<h3>{% translate "Conflicts of Interest" %}</h3>
{% url 'conduct_reporting' as url%}
<p>
{% blocktranslate trimmed %}
In the event of any conflict of interest a working group member must immediately
notify the other members, and recuse themselves if necessary. If a report concerns
a possible violation by a current working group member, this member should be
excluded from the response process. For these cases, anyone can make a report
directly to any of the working group chairs, as documented in the
<a href="{{ url }}">reporting guidelines</a>.
{% endblocktranslate %}</p>

<hr>

<p><i>
{% blocktranslate trimmed %}
Editor's note: Writing this document posed a unique challenge. Most
similar guides are written on the assumption of an in-person event. However, the
Django community doesn't exist in one place, and most of the time we're spread
out across the world and interact online. This makes trying to define and
enforce community standards a different type of challenge. This document is
adapted from the <a href="http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports">Ada Initiative template</a> and the <a href="https://us.pycon.org/2013/about/code-of-conduct/harassment-incidents/">PyCon 2013 Procedure for
Handling Harassment Incidents</a>, but changed to reflect the nature of our
community. It is our expectation that this will be a living document and change
as we grow to understand how to meet this challenge and best serve our community
and ideals.{% endblocktranslate %}</i>
</p>

This manual has moved to <a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md">
GitHub</a>. Please see the latest version there.{% endblocktranslate %}
</h2>
{% endblock %}
Loading