Merge branch 'master' into add-formData-support

2026-01-25 07:16:40 +00:00 · 2017-07-04 09:45:33 +04:30
parent 182ee093f4 521ab14eaf
commit 44840ab836
32 changed files with 428 additions and 259 deletions
--- a/test-app/spec/swagger_helper.rb
+++ b/test-app/spec/swagger_helper.rb
@@ -39,13 +39,16 @@ RSpec.configure do |config|
          properties: {
            id: { type: 'integer' },
            title: { type: 'string' },
-            content: { type: 'string' },
+            content: { type: 'string', 'x-nullable': true },
            thumbnail: { type: 'string'}
          },
          required: [ 'id', 'title', 'content', 'thumbnail' ]
        }
      },
      securityDefinitions: {
+        basic_auth: {
+          type: :basic
+        },
        api_key: {
          type: :apiKey,
          name: 'api_key',