From bf55513419cee32a32c7783ea95227f3c5e48091 Mon Sep 17 00:00:00 2001 From: LeFnord Date: Fri, 16 Dec 2016 01:37:43 +0100 Subject: [PATCH] updates travis.yml - updates UPGRADE - adds changelog entry --- .travis.yml | 24 +++++++++++------------- CHANGELOG.md | 2 ++ UPGRADING.md | 26 ++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3814dddd..afeebb09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,34 +6,32 @@ before_install: matrix: include: - - rvm: 2.3.1 + - rvm: 2.3.3 script: - bundle exec danger - - rvm: 2.3.1 + - rvm: 2.3.3 env: MODEL_PARSER=grape-swagger-entity - - rvm: 2.3.1 + - rvm: 2.3.3 env: MODEL_PARSER=grape-swagger-representable - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=0.14.0 - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=0.15.0 - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=0.16.2 - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=0.17.0 - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=0.18.0 - - rvm: 2.3.1 + - rvm: 2.3.3 env: GRAPE_VERSION=HEAD - - rvm: 2.3.0 - rvm: 2.2 - - rvm: 2.1 - rvm: ruby-head - - rvm: jruby-9.1.2.0 + - rvm: jruby-9.1.6.0 - rvm: jruby-head - rvm: rbx-2 allow_failures: - rvm: ruby-head - - rvm: jruby-9.1.2.0 + - rvm: jruby-9.1.6.0 - rvm: jruby-head - rvm: rbx-2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b6f8940..2d05e349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ #### Features +* [#554](https://github.com/ruby-grape/grape-swagger/pull/554): Updates travis.yml to align with grape - [@LeFnord](https://github.com/LeFnord). + * Your contribution here. #### Fixes diff --git a/UPGRADING.md b/UPGRADING.md index 6a0d13c8..25049080 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,5 +1,27 @@ -Upgrading Grape-swagger -======================= +## Upgrading Grape-swagger + +### Upgrading to >= 0.25.2 + +Avoids ambiguous documentation of array parameters, +by enforcing correct usage of both possibilities: + +1. Array of primitive types + ```ruby + params do + requires :foo, type: Array[String] + end + ``` + +2. Array of objects + ```ruby + params do + requires :put_params, type: Array do + requires :op, type: String + requires :path, type: String + requires :value, type: String + end + end +``` ### Upgrading to >= 0.25.0