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

Updated to 1.2 w/ passing tests #75

Merged
merged 34 commits into from
Dec 9, 2013
Merged

Updated to 1.2 w/ passing tests #75

merged 34 commits into from
Dec 9, 2013

Conversation

joelvh
Copy link
Contributor

@joelvh joelvh commented Dec 6, 2013

Made some updates based on @swistaczek's changes from pull request #67

Adriano Dadario and others added 30 commits September 19, 2013 14:33
Not necessary fix patch level in .rvmrc file.
Let use the current installed ruby patch level

Adriano Dadario
Vagas Tecnologia
Some URL with names that contains the character '-' were not captured by
the regex.
Example name /simple-test(:format)

Adriano Dadario
Vagas Tecnologia
Separated in method that convert to simples description to markdown when
set to true
For id and name values, include value specified in root value.
Also, change reason key to message key in error messages
…attbeedle-api-info

Conflicts:
	lib/grape-swagger.rb
	spec/api_models_spec.rb
	spec/default_api_spec.rb
	spec/hide_api_spec.rb
	spec/non_default_api_spec.rb
	spec/simple_mounted_api_spec.rb
@joelvh
Copy link
Contributor Author

joelvh commented Dec 6, 2013

Incorporated @mattbeedle's tests for the new "info" data in 1.2 from pull request #73

@joelvh joelvh mentioned this pull request Dec 6, 2013
@swistaczek
Copy link
Contributor

Great work @joelvh :)

@swistaczek swistaczek mentioned this pull request Dec 6, 2013
@tim-vandecasteele
Copy link
Contributor

Wow, great work!

tim-vandecasteele added a commit that referenced this pull request Dec 9, 2013
Updated to 1.2 w/ passing tests
@tim-vandecasteele tim-vandecasteele merged commit 74a1eee into ruby-grape:master Dec 9, 2013
@joelvh
Copy link
Contributor Author

joelvh commented Dec 9, 2013

Thanks for pulling the changes in!

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.

4 participants