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

fix: API merge message is optional #1710

Merged
merged 2 commits into from
Apr 5, 2021
Merged

fix: API merge message is optional #1710

merged 2 commits into from
Apr 5, 2021

Conversation

nopcoder
Copy link
Contributor

@nopcoder nopcoder commented Apr 4, 2021

Fix backward compatibility for merge request

@nopcoder nopcoder added the bug Something isn't working label Apr 4, 2021
@nopcoder nopcoder requested a review from itaiad200 April 4, 2021 11:57
@nopcoder nopcoder self-assigned this Apr 4, 2021
@nopcoder nopcoder marked this pull request as draft April 4, 2021 12:14
@nopcoder nopcoder marked this pull request as ready for review April 4, 2021 12:24
@codecov-io
Copy link

Codecov Report

Merging #1710 (654d2bb) into master (6a01ee3) will increase coverage by 0.03%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1710      +/-   ##
==========================================
+ Coverage   41.64%   41.67%   +0.03%     
==========================================
  Files         168      168              
  Lines       13316    13319       +3     
==========================================
+ Hits         5545     5551       +6     
+ Misses       7030     7027       -3     
  Partials      741      741              
Impacted Files Coverage Δ
pkg/api/controller.go 32.64% <0.00%> (+0.03%) ⬆️
pkg/catalog/validate.go 38.70% <0.00%> (ø)
pkg/gateway/operations/deleteobjects.go 0.00% <0.00%> (ø)
pkg/pyramid/tier_fs.go 60.69% <0.00%> (+2.18%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6a01ee3...654d2bb. Read the comment docs.

Copy link
Contributor

@arielshaqed arielshaqed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, but please keep the js copy of swagger.yml aligned with this PR.

THANKS!

@@ -1777,6 +1775,30 @@ paths:
required: true
schema:
type: string
get:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be off by one, it incorporates a previous change into this swaggacopy but not this change. Can you regenerate it before pulling?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure - I was sure the makefile validates they are the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

% sha256sum api/swagger.yml docs/assets/js/swagger.yml
9674aad548414c911e7c7d21f22bae22632e9c6e9f7784875549eb74917c34f4  api/swagger.yml
9674aad548414c911e7c7d21f22bae22632e9c6e9f7784875549eb74917c34f4  docs/assets/js/swagger.yml

@nopcoder nopcoder removed the request for review from itaiad200 April 5, 2021 18:36
@nopcoder nopcoder merged commit 65cd6a2 into master Apr 5, 2021
@nopcoder nopcoder deleted the bug/merge-no-message branch April 5, 2021 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants