Merge branch 'master' into add-formData-support

test-app/config/routes.rb

@@ -2,6 +2,8 @@ TestApp::Application.routes.draw do
   resources :blogs, defaults: { :format => :json }
   put '/blogs/:id/upload', to: 'blogs#upload'
 
+  post 'auth-tests/basic', to: 'auth_tests#basic'
+
   mount Rswag::Api::Engine => 'api-docs'
   mount Rswag::Ui::Engine => 'api-docs'
 end