Skip to content

Merge main into releases/v2 #1669

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
Merged
dbartol merged 32 commits into from
May 4, 2023
Merged

Merge main into releases/v2 #1669

dbartol merged 32 commits into from
May 4, 2023

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 4, 2023 •
edited by dbartol
Loading

Merging 318bcc7 into releases/v2.

Conductor for this PR is @dbartol.

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/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
  • Merge the mergeback PR that will automatically be created once this PR is merged.

tgrall and others added 30 commits March 18, 2023 13:40
@tgrall
- Add new configuration Parameter
ee44252 
- Write test to check it is read from configuration
- Update documentation
@tgrall
update changelog
94786b3
@tgrall
fix linter issues
2f14134
@tgrall
Update README.md - typo
f81f527
@tgrall
Update README.md
f1fb80a
@tgrall
fix CI failure - check js
34231cf
@tgrall
rename new parameter from configuration to config
fe4a785
@tgrall
Merge branch 'main' into issue-1589-config-param
18f1345
@tgrall @henrymercer
Accept change in PR
696504d 
Co-authored-by: Henry Mercer <[email protected]>
@tgrall @henrymercer
Update init/action.yml : PR review
a9fb7d9 
Co-authored-by: Henry Mercer <[email protected]>
@tgrall @henrymercer
Update README.md : during PR Review
d2950c1 
Co-authored-by: Henry Mercer <[email protected]>
@tgrall @henrymercer
Update README.md : during PR Review
c9f360d 
Co-authored-by: Henry Mercer <[email protected]>
@tgrall @henrymercer
Update CHANGELOG.md : during PR Review
0b75f47 
Co-authored-by: Henry Mercer <[email protected]>
@tgrall
resolve comments from @henrymercer
b4e6f81
@tgrall
remove the documentation about workflow parameters
fc374f5
@tgrall
fix after review from @henrymercer
f398a65
@tgrall
remove space from json string
7b876ae
@tgrall
add test with config file and input together
47cec7a
Update changelog and version after v2.3.2
1cccbfc
Update checked-in dependencies
e3395de
@angelapwen
Merge pull request #1663 from github/mergeback/v2.3.2-to-main-f3feb00a
f31a31c 
Mergeback v2.3.2 refs/heads/releases/v2 into main
@aeisenberg
Merge remote-tracking branch 'upstream/main' into issue-1589-config-p…
824d18c 
…aram
Update default bundle to codeql-bundle-20230428
234bada
Add changelog note
40c9593
@aeisenberg
Update CHANGELOG.md
cba5616
@aeisenberg
Merge pull request #1665 from github/aeisenberg/config-param
d2f6dfd 
Add new configuration Parameter
@aeisenberg
Add link to changenote for custom config
b1b3d00 
Also, use a better link in the readme.
@aeisenberg
Merge pull request #1666 from github/aeisenberg/readme-update
8ca5570 
Add link to changenote for custom config
Merge branch 'main' into update-bundle/codeql-bundle-20230428
3346195
Fix workflow formatting
f72bf5d
Dave Bartolomeo and others added 2 commits May 4, 2023 00:32
@dbartol dbartol marked this pull request as ready for review May 4, 2023 18:25
@dbartol dbartol requested a review from a team as a code owner May 4, 2023 18:25
@dbartol dbartol enabled auto-merge May 4, 2023 18:27
@dbartol dbartol merged commit 29b1f65 into releases/v2 May 4, 2023
@dbartol dbartol deleted the update-v2.3.3-318bcc7f8 branch May 4, 2023 18:52
@snyk-bot snyk-bot mentioned this pull request May 30, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dbartol dbartol dbartol approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@dbartol dbartol

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dbartol @tgrall @angelapwen @aeisenberg