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.

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

Align dev branch with master #861

Merged
merged 29 commits into from
Jul 12, 2023
Merged

Align dev branch with master #861

merged 29 commits into from
Jul 12, 2023

Conversation

omerzi
Copy link
Member

@omerzi omerzi commented Jul 12, 2023

  • All tests passed. If this feature is not already covered by the tests, I added new tests.
  • All static analysis checks passed.
  • This pull request is on the dev branch.
  • I used gofmt for formatting the code before submitting the pull request.

omerzi and others added 29 commits April 5, 2023 10:15
* Improve UI for scan command (#706)

* Upgrade go version in go.mod to 1.20 (#732)

* Fix lint issues found (#733)

* Config transfer - ensure target not older than source (#721)

* Update tests environment - nuget and dotnet to version 6  (#734)

* Flatten audit graph (#736)

* Use gradle-dep-tree with Audit (#719)

---------

Co-authored-by: Sara Omari <114062096+sarao1310@users.noreply.github.com>
Co-authored-by: Eyal Ben Moshe <eyalbenmoshe@jfrog.com>
Co-authored-by: Michael Sverdlov <sverdlov93@gmail.com>
Co-authored-by: Yahav Itzhak <yahavi@users.noreply.github.com>
# Conflicts:
#	.github/workflows/analysis.yml
#	go.mod
#	go.sum
#	xray/audit/java/gradle.go
#	xray/commands/audit/generic/auditmanager.go
@omerzi omerzi requested a review from eyalbe4 July 12, 2023 16:16
@eyalbe4 eyalbe4 changed the title Align dev with master Align dev branch with master Jul 12, 2023
@eyalbe4 eyalbe4 added the ignore for release Automatically generated release notes label Jul 12, 2023
@eyalbe4 eyalbe4 merged commit c540ed9 into dev Jul 12, 2023
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ignore for release Automatically generated release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants