Skip to content

Commit 1ba7c43

Browse files
Arya-ADArya-AD
authored
Merge pull request #70 from django/docs/update-procedures
Documenting how to propose updates to the CoC
2 parents ac6d21c + d2e947a commit 1ba7c43

File tree

6 files changed

+446
-20
lines changed

6 files changed

+446
-20
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @django/coc-committee

‎.github/ISSUE_TEMPLATE/coc-change-proposal.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: "Propose a Code of Conduct Change"
3+
about: "Suggest a change to the Django Code of Conduct or its procedures"
4+
title: "[CoC Proposal] "
5+
labels: ["proposal"]
6+
---
7+
8+
## Type of Change
9+
10+
- [ ] Change to the Code of Conduct text itself
11+
- [ ] Change to Code of Conduct-related documentation (procedures, FAQs, enforcement process, etc.)
12+
- [ ] Other (please specify)
13+
14+
## Proposed Change
15+
16+
Provide a clear description of the change you're proposing. If proposing a text change, include:
17+
18+
- What text should change
19+
- What it should change to
20+
- Why this change is needed
21+
22+
## Rationale
23+
24+
Explain the reasoning behind this proposal. How does this change improve the Code of Conduct or related documentation? What problem does it solve?
25+
26+
## Additional Context
27+
28+
- Does this affect the entire Django community or specific groups?
29+
- Are there any related discussions or prior conversations about this?
30+
- Any other relevant context?
31+
32+
## Next Steps
33+
34+
This proposal will be reviewed by the Django Code of Conduct Working Group. You can expect:
35+
36+
1. **Discussion**: The Working Group will discuss your proposal during monthly meetings and may solicit feedback from the broader Django community.
37+
2. **Decision**: The Working Group will reach consensus on whether to approve the change.
38+
3. **Implementation**: If approved:
39+
- Changes to the Code of Conduct itself require final approval from the DSF Board before merging.
40+
- Changes to related documentation can be merged directly by the Working Group.
41+
4. **Announcement**: Approved changes will be announced to the Django community.
42+
43+
Please see [UPDATE PROCEDURES](../../updates.md) for more details on the proposal process.

‎.github/workflows/update-changelog.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Update changelog
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: write
10+
pull-requests: read
11+
12+
jobs:
13+
update-changelog:
14+
if: github.actor != 'github-actions[bot]'
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out repository
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Generate changelog entry
23+
shell: bash
24+
run: |
25+
bash scripts/update_changelog.sh
26+
27+
- name: Commit changelog
28+
shell: bash
29+
run: |
30+
set -euo pipefail
31+
32+
if git diff --quiet -- CHANGELOG.md; then
33+
echo "No changelog updates to commit."
34+
exit 0
35+
fi
36+
37+
git config user.name "github-actions[bot]"
38+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
39+
git add CHANGELOG.md
40+
git commit -m "Update changelog"
41+
git push

‎CHANGELOG.md‎

Lines changed: 89 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,104 @@
1+
# Django Code of Conduct Documentation Change Log
2+
13
This document should be updated whenever a change is made after this
24
documentation will be made public. This is to transparently show how and what
35
changes to the documentation are made without forcing people through the
4-
experience of looking at commit log. This may also include summary of rationale behind a change.
6+
experience of looking at commit log. This may also include summary of rationale behind a change.
7+
8+
## 2026-01-13: Copy docs from djangoproject.com to here for future change tracking
9+
10+
- 📝 copied Enforcement Manual from djangoproject.com
11+
- 📝 copied Reporting Guide from djangoproject.com
12+
- 📝 copied CoC from djangoproject.com
13+
- 📝 copied FAQs from djangoproject.com
14+
15+
## 2025-08-25: Update membership list with new members
16+
17+
## 2025-07-03: Update issue templates
18+
19+
## 2024-11-11: :pencil: Updates current members to reflect Nov 11/12th meeting
20+
21+
- :pencil: Updates ordering
22+
23+
## 2024-04-05: Update the membership
24+
25+
- Update membership.md
26+
27+
## 2018-06-09: :123: Update stats for 2018
28+
29+
## 2018-06-08: :pencil: Updated term used to describe banned members
30+
31+
## 2017-10-18: October 2017 Updates
32+
33+
- :pencil: Updates last updated date on stats
34+
- :pencil: Updates name
35+
- :gem: Updates changelog
36+
- :pencil: Updates membership
37+
- :pencil: Updates stats for 2017 in progress
38+
39+
## 2017-07-17: Remove Lacey
40+
41+
- Update membership.md
42+
43+
## 2017-03-20: Added new members
44+
45+
## 2017-02-03: Add Lacey + dates
46+
47+
## 2017-01-13: Update membership.md
48+
49+
## 2016-07-20: Fix typo
50+
51+
## 2016-07-18: Merge branch 'master' into 03-conference-suport-guideline
52+
53+
- Move TODO from docs into issue #26
54+
- Adding few more internal links
55+
- Re #20 Fix typo; neutral gender.
56+
- Re #20 first draft communications guidelines
57+
- Re #8 adding case-closure actions.
58+
- Proofing. NB I have also changed the language of the initial response emails to convey why we appreciate receiving reports.
59+
60+
## 2016-07-14: Adding few more internal links
61+
62+
## 2016-07-14: 20 communications guidelines
63+
64+
- Re #20 Fix typo; neutral gender.
65+
- Re #20 first draft communications guidelines
66+
67+
## 2016-07-14: Re #8 adding case-closure actions.
68+
69+
## 2016-07-13: Merge branch 'master' of github.com:django/code-of-conduct
70+
71+
- Rewording information about data retention. Thanks @phalt
72+
- Fix typos in contributing.md
73+
- Fix #11 - Add contributing docs, changelog and improve readme
74+
- Add membership length timetable
75+
- Information what happens when someone leaks sensitive data
76+
- Fixes #4 -- Add information about data retention and access
77+
- Added shepherding
578

6-
### XXXX-XX-XX
79+
## 2016-07-11: Merge branch 'master' into data-retention
780

8-
*Brief description of changes*
81+
- Fix typos in contributing.md
82+
- Fix #11 - Add contributing docs, changelog and improve readme
83+
- Add membership length timetable
984

10-
### 2018-06-09
11-
12-
- Updates Jeff's status
13-
- Updated stats for 2018
85+
## 2016-07-11: Merge branch 'contributing'
1486

15-
### 2018-06-08
16-
17-
- Updated term used to describe banned members.
87+
- Fix typos in contributing.md
88+
- Fix #11 - Add contributing docs, changelog and improve readme
1889

19-
### 2017-10-17
90+
## 2016-07-11: Add membership length timetable
2091

21-
- Updated stats for 2017
22-
- Updates membership to reflect current and past members.
92+
## 2016-07-01: Added shepherding docs
2393

24-
### 2017-03-20
94+
- Added shepherding
2595

26-
- Updates membership to reflect current members.
96+
## 2016-06-05: Fixes #5 -- Add information about transparency
2797

28-
### 2017-01-11
98+
- Fix grammar in Transparency chapter
2999

30-
- Updated stats for 2016
31-
- Updates membership to reflect current and past members.
100+
## 2016-05-26: Fixes #6 -- Add details about receiving reports, on-call duty and example initial responses
32101

33-
### 2016-07-19
102+
- Typos in grammar in receiving reports chapter
34103

35-
DSF Code of Conduct Documentation is made public at DjangoCon US 2016.
104+
## 2016-05-26: Updating statistics based on current spreadsheet values. Adding more detail.

0 commit comments

Comments
 (0)