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

fixes #1778. Allow 'result' name for API parameter #1780

Merged
merged 1 commit into from
Nov 17, 2018
Merged

fixes #1778. Allow 'result' name for API parameter #1780

merged 1 commit into from
Nov 17, 2018

Conversation

mtfelian
Copy link
Contributor

@mtfelian mtfelian commented Nov 1, 2018

No description provided.

@mtfelian mtfelian changed the title fixes github.com/go-swagger/go-swagger/issues/1778 fixes #1778 Nov 1, 2018
@mtfelian
Copy link
Contributor Author

mtfelian commented Nov 1, 2018

Fixes #1778

fredbi
fredbi requested changes Nov 1, 2018
View reviewed changes
Copy link
Contributor

@fredbi fredbi left a comment

Choose a reason for hiding this comment

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

You have modified a template.
You now have to release a newly generated version of generator/bindata.go.
See script in ./.githooks/pre-commit.
NOTE: you should run go-bindata using github.com/kevinburke/go-bindata

@codecov
Copy link

codecov bot commented Nov 1, 2018 •
edited
Loading

Codecov Report

Merging #1780 into master will increase coverage by 0.19%.
The diff coverage is 77.77%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1780      +/-   ##
==========================================
+ Coverage   80.07%   80.27%   +0.19%     
==========================================
  Files          38       38              
  Lines        7494     7476      -18     
==========================================
  Hits         6001     6001              
+ Misses       1014      996      -18     
  Partials      479      479
Impacted Files Coverage Δ
generator/bindata.go 70.92% <77.77%> (+2.57%) ⬆️

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 1200dd8...03a02f6. Read the comment docs.

@casualjim
Copy link
Member

can you do this sign off on the commit? git commit --amend --signoff

@fredbi
Copy link
Contributor

fredbi commented Nov 2, 2018

Looks good to me

@mtfelian mtfelian changed the title fixes #1778 fixes #1778. Allow 'result' name for API parameter Nov 2, 2018
@fredbi
Copy link
Contributor

fredbi commented Nov 16, 2018

@mtfelian could you please rebase your PR, so we may proceed with the merge? Thank you

@mtfelian
fixes github.com/go-swagger/issues/1778
03a02f6 
Signed-off-by: Artemij <ffelian@gmail.com>

updated bindata.go

Signed-off-by: Artemij Shepelev <ffelian@gmail.com>
@mtfelian
Copy link
Contributor Author

@fredbi rebased the branch sorry for the delay.

@fredbi
Copy link
Contributor

fredbi commented Nov 17, 2018

Thanks. Almost there! But I can't merge... I assume this is because of the missing GPG-signature

@casualjim casualjim merged commit 0e85bf1 into go-swagger:master Nov 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregmarr gregmarr gregmarr left review comments

@casualjim casualjim casualjim approved these changes

@fredbi fredbi fredbi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mtfelian @casualjim @fredbi @gregmarr