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 group parameters' name with type Array #221

Closed
wants to merge 2 commits into from
Closed

Fix group parameters' name with type Array #221

wants to merge 2 commits into from

Conversation

u2
Copy link
Contributor

@u2 u2 commented Feb 27, 2015

No description provided.

@u2 u2 changed the title Array repair Fix group parameters' name with type Array Feb 27, 2015
@@ -2,6 +2,7 @@

#### Features

* [#221](https://github.com/tim-vandecasteele/grape-swagger/pull/221): Fixed group parameters' name with type Array - [@u2](https://github.com/u2).
Copy link
Member

Choose a reason for hiding this comment

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

This is a fix, no? Should be in Fixes.

@u2
Copy link
Contributor Author

u2 commented Mar 2, 2015

Yes,it's a fix, I will improve it.

@u2
Copy link
Contributor Author

u2 commented Mar 2, 2015

Updated.

@dblock
Copy link
Member

dblock commented Mar 2, 2015

Sorry I merged another PR that conflicts with this, would you mind rebasing? Apologies.

@u2
Copy link
Contributor Author

u2 commented Mar 3, 2015

It can be merged now, I think.

@dblock
Copy link
Member

dblock commented Mar 3, 2015

Merged via tim-vandecasteele@12dae15.

I squashed that other "merge and fix conflicts" commit by doing this:

git checkout master
git checkout -b new-branch
git merge array_repair --squash
git commit ...

@dblock dblock closed this Mar 3, 2015
@adie adie mentioned this pull request Sep 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants