chore: Merge main into feat/user2person#6880
Merged
jennifer-richards merged 565 commits intoietf-tools:feat/user2personfrom Jan 5, 2024
Merged
chore: Merge main into feat/user2person#6880jennifer-richards merged 565 commits intoietf-tools:feat/user2personfrom
jennifer-richards merged 565 commits intoietf-tools:feat/user2personfrom
Conversation
fix: Deal with different group orders
fix: The NomCom chair is not eligible for NomCom
feat: Add the ability to rerun a test suite until a failure occurs
fix: Add link to public pages to private NomCom pages
fix: Limit group names to 80 characters in tests
…ls#6419) * fix: make statement published time match statement doc time * test: improve testing of creating statements
* fix: teach search about rfcs and subseries * fix: more general manipulation of searches for rfc and subseries * fix: only tweak subseries search if the thing after the subseries id is digits
* Remove doc.note * Address comments from @rjsparks * Consistently display doc notes
…ols#6432) * Submit can replace * Empty commit for CI * revert change to api_submit_info
…etf-tools#6424) * feat: Update IRTF state when entering/exiting IETF conflict review (ietf-tools#3469) * fix: Update IRTF state in approve_conflict_review() as well * chore: Add "new_state != prev_state" guard
) Fixes ietf-tools#6466 While I'm here, apply list styling more consistently across NomCom pages.
…tf-tools#6442) * fix: Add remote instructions to interim agenda page Fixes ietf-tools#6433 Fixes ietf-tools#6249 * Also add date and time * Fix HTML * Fix CI fail * Address code review comments * More suggestions from @rjsparks * Fix HTML * Add suffix
ci: merge release to main
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…-tools#6848) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3.0.2 to 4.1.0. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v3.0.2...v4.1.0) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#6858) Bumps [appleboy/ssh-action](https://github.com/appleboy/ssh-action) from 1.0.0 to 1.0.2. - [Release notes](https://github.com/appleboy/ssh-action/releases) - [Commits](appleboy/ssh-action@55dabf8...2451745) --- updated-dependencies: - dependency-name: appleboy/ssh-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…etf-tools#6795) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
…f-tools#6733) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
…ls#6869) Bumps the all group in /dev/deploy-to-container with 1 update: [dockerode](https://github.com/apocas/dockerode). Updates `dockerode` from 4.0.0 to 4.0.2 - [Release notes](https://github.com/apocas/dockerode/releases) - [Commits](apocas/dockerode@v4.0.0...v4.0.2) --- updated-dependencies: - dependency-name: dockerode dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ietf-tools#6874) Bumps the all group in /dev/coverage-action with 4 updates: [chart.js](https://github.com/chartjs/Chart.js), [eslint](https://github.com/eslint/eslint), [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) and [npm-check-updates](https://github.com/raineorshine/npm-check-updates). Updates `chart.js` from 3.5.1 to 3.9.1 - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](chartjs/Chart.js@v3.5.1...v3.9.1) Updates `eslint` from 8.53.0 to 8.56.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.53.0...v8.56.0) Updates `eslint-plugin-import` from 2.29.0 to 2.29.1 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.29.0...v2.29.1) Updates `npm-check-updates` from 16.14.11 to 16.14.12 - [Release notes](https://github.com/raineorshine/npm-check-updates/releases) - [Changelog](https://github.com/raineorshine/npm-check-updates/blob/main/CHANGELOG.md) - [Commits](raineorshine/npm-check-updates@v16.14.11...v16.14.12) --- updated-dependencies: - dependency-name: chart.js dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: npm-check-updates dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…tf-tools#6872) Bumps the all group in /playwright with 5 updates: | Package | From | To | | --- | --- | --- | | [@playwright/test](https://github.com/microsoft/playwright) | `1.40.0` | `1.40.1` | | [eslint](https://github.com/eslint/eslint) | `8.53.0` | `8.56.0` | | [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) | `2.29.0` | `2.29.1` | | [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) | `16.3.1` | `16.6.1` | | [npm-check-updates](https://github.com/raineorshine/npm-check-updates) | `16.14.11` | `16.14.12` | Updates `@playwright/test` from 1.40.0 to 1.40.1 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](microsoft/playwright@v1.40.0...v1.40.1) Updates `eslint` from 8.53.0 to 8.56.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.53.0...v8.56.0) Updates `eslint-plugin-import` from 2.29.0 to 2.29.1 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.29.0...v2.29.1) Updates `eslint-plugin-n` from 16.3.1 to 16.6.1 - [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases) - [Commits](eslint-community/eslint-plugin-n@16.3.1...16.6.1) Updates `npm-check-updates` from 16.14.11 to 16.14.12 - [Release notes](https://github.com/raineorshine/npm-check-updates/releases) - [Changelog](https://github.com/raineorshine/npm-check-updates/blob/main/CHANGELOG.md) - [Commits](raineorshine/npm-check-updates@v16.14.11...v16.14.12) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: eslint-plugin-n dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: npm-check-updates dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ls#6876) Bumps the all group in /dev/diff with 2 updates: [dockerode](https://github.com/apocas/dockerode) and [fs-extra](https://github.com/jprichardson/node-fs-extra). Updates `dockerode` from 4.0.0 to 4.0.2 - [Release notes](https://github.com/apocas/dockerode/releases) - [Commits](apocas/dockerode@v4.0.0...v4.0.2) Updates `fs-extra` from 11.1.1 to 11.2.0 - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](jprichardson/node-fs-extra@11.1.1...11.2.0) --- updated-dependencies: - dependency-name: dockerode dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: fs-extra dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts: # ietf/community/tests.py # ietf/community/views.py # ietf/templates/doc/document_draft.html # ietf/templates/doc/search/search_result_row.html # requirements.txt
fix: Correctly display the last pre-RFC rev of a draft
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
13 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Using a proxy main branch to deal with conflicts