Skip to content

Commit 6c260a5

Browse files
Merge 7.45.1.dev0 into Bootstrap 5 update branch. Made a first pass at reconciling differences.
- Legacy-Id: 19945
2 parents 37cb737 + 8fd6f33 commit 6c260a5

162 files changed

Lines changed: 10427 additions & 1463 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,19 @@
5858

5959
// Add the IDs of extensions you want installed when the container is created.
6060
"extensions": [
61-
"ms-python.python",
62-
"ms-python.vscode-pylance",
63-
"ms-azuretools.vscode-docker",
64-
"editorconfig.editorconfig",
65-
"redhat.vscode-yaml",
66-
"visualstudioexptteam.vscodeintellicode",
67-
"batisteo.vscode-django",
68-
"mutantdino.resourcemonitor",
69-
"spmeesseman.vscode-taskexplorer",
70-
"mtxr.sqltools",
71-
"mtxr.sqltools-driver-mysql"
72-
],
61+
"ms-python.python",
62+
"ms-python.vscode-pylance",
63+
"ms-azuretools.vscode-docker",
64+
"editorconfig.editorconfig",
65+
"redhat.vscode-yaml",
66+
"visualstudioexptteam.vscodeintellicode",
67+
"batisteo.vscode-django",
68+
"mutantdino.resourcemonitor",
69+
"spmeesseman.vscode-taskexplorer",
70+
"mtxr.sqltools",
71+
"mtxr.sqltools-driver-mysql",
72+
"mrmlnc.vscode-duplicate"
73+
],
7374

7475
// Use 'forwardPorts' to make a list of ports inside the container available locally.
7576
"forwardPorts": [8000, 3306],

.devcontainer/docker-compose.extend.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ services:
44
app:
55
environment:
66
EDITOR_VSCODE: 1
7+
DJANGO_SETTINGS_MODULE: settings_local_sqlitetest
78
volumes:
8-
- ..:/root/src:cached
9+
- ..:/root/src
910
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
1011
network_mode: service:db

.editorconfig

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
root = true
66

77
# Settings for IETF datatracker
8+
# ---------------------------------------------------------
9+
# PEP8 Style
810

911
[*]
1012
indent_style = space
@@ -14,3 +16,39 @@ charset = utf-8
1416
# to avoid tripping Henrik's commit hook:
1517
trim_trailing_whitespace = false
1618
insert_final_newline = false
19+
20+
# Settings for .github folder
21+
# ---------------------------------------------------------
22+
# GitHub Markdown Style
23+
24+
[.github/**]
25+
indent_style = space
26+
indent_size = 2
27+
end_of_line = lf
28+
charset = utf-8
29+
trim_trailing_whitespace = false
30+
insert_final_newline = true
31+
32+
# Settings for client-side JS / Vue files
33+
# ---------------------------------------------------------
34+
# StandardJS Style
35+
36+
[client/**]
37+
indent_style = space
38+
indent_size = 2
39+
end_of_line = lf
40+
charset = utf-8
41+
trim_trailing_whitespace = true
42+
insert_final_newline = true
43+
44+
# Settings for cypress tests
45+
# ---------------------------------------------------------
46+
# StandardJS Style
47+
48+
[cypress/**]
49+
indent_style = space
50+
indent_size = 2
51+
end_of_line = lf
52+
charset = utf-8
53+
trim_trailing_whitespace = true
54+
insert_final_newline = true
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# GITHUB ACTIONS - WORKFLOW
2+
3+
# Build the database dev docker image with the latest database dump every night
4+
# so that developers don't have to manually build it themselves.
5+
6+
name: Nightly Dev DB Image
7+
8+
# Controls when the workflow will run
9+
on:
10+
schedule:
11+
- cron: '0 0 * * *'
12+
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
env:
17+
REGISTRY: ghcr.io
18+
IMAGE_NAME: datatracker-db
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
if: ${{ github.ref == 'refs/heads/main' }}
24+
permissions:
25+
contents: read
26+
packages: write
27+
steps:
28+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29+
- uses: actions/checkout@v2
30+
31+
- name: Get Current Date as Tag
32+
id: date
33+
run: echo "::set-output name=date::$(date +'%Y%m%d')"
34+
35+
- name: Docker Build & Push Action
36+
uses: mr-smithers-excellent/docker-build-push@v5.6
37+
with:
38+
image: ${{ env.IMAGE_NAME }}
39+
tags: nightly-${{ steps.date.outputs.date }}, latest
40+
registry: ${{ env.REGISTRY }}
41+
dockerfile: docker/db.Dockerfile
42+
username: ${{ github.actor }}
43+
password: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@
5454
/unix.tag
5555
*.pyc
5656
__pycache__
57+
node_modules

.vscode/tasks.json

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"problemMatcher": []
4444
},
4545
{
46-
"label": "Run JS Tests",
46+
"label": "Run JS Tests (python)",
4747
"type": "shell",
4848
"command": "/usr/local/bin/python",
4949
"args": [
@@ -117,7 +117,7 @@
117117
"type": "shell",
118118
"command": "/bin/bash",
119119
"args": [
120-
"${workspaceFolder}/docker/app-win32-timezone-fix.sh"
120+
"${workspaceFolder}/docker/scripts/app-win32-timezone-fix.sh"
121121
],
122122
"presentation": {
123123
"echo": true,
@@ -128,6 +128,24 @@
128128
"clear": false
129129
},
130130
"problemMatcher": []
131+
},
132+
{
133+
"label": "Run JS Tests (cypress)",
134+
"type": "shell",
135+
"command": "/bin/bash",
136+
"args": [
137+
"${workspaceFolder}/docker/scripts/app-cypress.sh"
138+
],
139+
"group": "test",
140+
"presentation": {
141+
"echo": true,
142+
"reveal": "always",
143+
"focus": true,
144+
"panel": "new",
145+
"showReuseMessage": false,
146+
"clear": false
147+
},
148+
"problemMatcher": []
131149
}
132150
]
133151
}

CODE_OF_CONDUCT.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Code of Conduct
2+
3+
This is a reminder of IETF policies in effect on various topics such as patents
4+
or code of conduct. It is only meant to point you in the right direction.
5+
Exceptions may apply. The IETF's patent policy and the definition of an IETF
6+
"contribution" and "participation" are set forth in
7+
[BCP 79](https://www.rfc-editor.org/info/bcp79); please read it carefully.
8+
9+
As a reminder:
10+
* By participating in the IETF, you agree to follow IETF processes and
11+
policies.
12+
* If you are aware that any IETF contribution is covered by patents or patent
13+
applications that are owned or controlled by you or your sponsor, you must
14+
disclose that fact, or not participate in the discussion.
15+
* As a participant in or attendee to any IETF activity you acknowledge that
16+
written, audio, video, and photographic records of meetings may be made public.
17+
* Personal information that you provide to IETF will be handled in accordance
18+
with the IETF Privacy Statement.
19+
* As a participant or attendee, you agree to work respectfully with other
20+
participants; please contact the
21+
[ombudsteam](https://www.ietf.org/contact/ombudsteam/) if you have questions
22+
or concerns about this.
23+
24+
Definitive information is in the documents listed below and other IETF BCPs.
25+
For advice, please talk to WG chairs or ADs:
26+
27+
* [BCP 9 (Internet Standards Process)](https://www.rfc-editor.org/info/bcp9)
28+
* [BCP 25 (Working Group processes)](https://www.rfc-editor.org/info/bcp25)
29+
* [BCP 25 (Anti-Harassment Procedures)](https://www.rfc-editor.org/info/bcp25)
30+
* [BCP 54 (Code of Conduct)](https://www.rfc-editor.org/info/bcp54)
31+
* [BCP 78 (Copyright)](https://www.rfc-editor.org/info/bcp78)
32+
* [BCP 79 (Patents, Participation)](https://www.rfc-editor.org/info/bcp79)
33+
* [Privacy Policy](https://www.ietf.org/privacy-policy/)

0 commit comments

Comments
 (0)