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.

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

Jump to bottom

Merge releases/v2 into releases/v1 #1347

Merged
merged 14 commits into from
Nov 4, 2022
Merged

Merge releases/v2 into releases/v1 #1347

merged 14 commits into from
Nov 4, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 4, 2022 •
edited by aeisenberg
Loading

Merging c3b6fce into releases/v1

Conductor for this PR is @aeisenberg.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v1 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

github-actions[bot] and others added 13 commits November 2, 2022 12:13
Update changelog and version after v2.1.30
60c8cda
Update checked-in dependencies
81a1ec0
@henrymercer
Merge pull request #1342 from github/mergeback/v2.1.30-to-main-18fe527f
7151077 
Mergeback v2.1.30 refs/heads/releases/v2 into main
@edoardopirovano
Prune results of Ruby query from SARIF
862a512
@edoardopirovano
Merge pull request #1344 from github/edoardo/prune-ruby
a8cabaf 
Prune results of Ruby query from SARIF
Update changelog for v2.1.31
e260194
@aeisenberg
Update CHANGELOG.md
29a5553 
Add message about `rb/weak-cryptographic-algorithm`.
@aeisenberg
Update CHANGELOG.md
8aa42f1 
Add link to codeql PR.
@aeisenberg
Merge pull request #1345 from github/update-v2.1.31-a8cabafa
c3b6fce 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.30"
69423c9 
This reverts commit 8428fd9.
Revert "Update checked-in dependencies"
9acbd2a 
This reverts commit bdbba7a.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.31…
b1b2d85 
…-c3b6fce4
Update version and changelog for v1.1.31
6132391
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Nov 4, 2022
@aeisenberg aeisenberg marked this pull request as ready for review November 4, 2022 20:47
@aeisenberg aeisenberg requested a review from a team as a code owner November 4, 2022 20:47
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Nov 4, 2022
@aeisenberg aeisenberg closed this Nov 4, 2022
@aeisenberg aeisenberg reopened this Nov 4, 2022
@aeisenberg aeisenberg added the Update dependencies Trigger PR workflow to update dependencies label Nov 4, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Nov 4, 2022
@aeisenberg aeisenberg closed this Nov 4, 2022
@aeisenberg aeisenberg reopened this Nov 4, 2022
@aeisenberg
Copy link
Contributor

Re-running the checks after the Update dependencies job has run.

@aeisenberg aeisenberg enabled auto-merge November 4, 2022 22:22
@aeisenberg aeisenberg merged commit 9e288b0 into releases/v1 Nov 4, 2022
@aeisenberg aeisenberg deleted the update-v1.1.31-c3b6fce4 branch November 4, 2022 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityasharad adityasharad adityasharad approved these changes

Assignees

@aeisenberg aeisenberg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aeisenberg @adityasharad @henrymercer @edoardopirovano