Merge branch 'swagger-2.0' into master

Author: peter scholz

lib/grape-swagger/endpoint.rb

@@ -229,7 +229,8 @@ def default_staus_codes
 
     def params_object(route)
       partition_params(route).map do |param, value|
-        parse_params(param, { required: false }.merge(value), route.route_path, route.route_method)
+        value = { required: false }.merge(value) if value.is_a?(Hash)
+        parse_params(param, value, route.route_path, route.route_method)
       end
     end