8000 fix up bad merge by denis-yuen · Pull Request #5915 · dockstore/dockstore · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix up bad merge #5915

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
merged 1 commit into from
Jun 19, 2024
Merged

fix up bad merge #5915

merged 1 commit into from
Jun 19, 2024

Conversation

denis-yuen
Copy link
Member
@denis-yuen denis-yuen commented Jun 19, 2024 •
edited
Loading

Description
Fix up oddity from 1.15.3 merge

Review Instructions
Should pass tests after merge

Issue
n/a

Security and Privacy
None

Please make sure that you've checked the following before submitting your pull request. Thanks!

  • Check that you pass the basic style checks and unit tests by running mvn clean install
  • Ensure that the PR targets the correct branch. Check the milestone or fix version of the ticket.
  • Follow the existing JPA patterns for queries, using named parameters, to avoid SQL injection
  • If you are changing dependencies, check the Snyk status check or the dashboard to ensure you are not introducing new high/critical vulnerabilities
  • Assume that inputs to the API can be malicious, and sanitize and/or check for Denial of Service type values, e.g., massive sizes
  • Do not serve user-uploaded binary images through the Dockstore API
  • Ensure that endpoints that only allow privileged access enforce that with the @RolesAllowed annotation
  • Do not create cookies, although this may change in the future
  • If this PR is for a user-facing feature, create and link a documentation ticket for this feature (usually in the same milestone as the linked issue). Style points if you create a documentation PR directly and link that instead.

@denis-yuen denis-yuen self-assigned this Jun 19, 2024
@denis-yuen denis-yuen marked this pull request as ready for review June 19, 2024 19:41
@denis-yuen denis-yuen requested review from kathy-t, a team, david4096 and hyunnaye and removed request for a team June 19, 2024 19:41
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@codecov Codecov
Copy link
codecov bot commented Jun 19, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.33%. Comparing base (9df582f) to head (634b025).

Additional details and impacted files 
@@              Coverage Diff              @@
##             develop    #5915      +/-   ##
=============================================
+ Coverage      72.41%   74.33%   +1.91%     
- Complexity      5186     5369     +183     
=============================================
  Files            375      375              
  Lines          19432    19432              
  Branches        2031     2031              
=============================================
+ Hits           14071    14444     +373     
+ Misses          4398     4015     -383     
- Partials         963      973      +10
Flag Coverage Δ
bitbuckettests 26.92% <ø> (+0.01%) ⬆️
hoverflytests 27.39% <ø> (ø)
integrationtests 56.85% <ø> (ø)
languageparsingtests 11.08% <ø> (ø)
localstacktests 21.59% <ø> (?)
toolintegrationtests 30.31% <ø> (ø)
unit-tests_and_non-confidential-tests 25.97% <ø> (ø)
workflowintegrationtests 38.22% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@denis-yuen denis-yuen merged commit e96e5a3 into develop Jun 19, 2024
19 checks passed
@denis-yuen denis-yuen deleted the feature/fix_hotfix_merge branch June 19, 2024 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kathy-t kathy-t kathy-t approved these changes

@david4096 david4096 Awaiting requested review from david4096 david4096 was automatically assigned from dockstore/dockstore

@hyunnaye hyunnaye Awaiting requested review from hyunnaye hyunnaye was automatically assigned from dockstore/dockstore

Assignees

@denis-yuen denis-yuen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@denis-yuen @kathy-t
0