Merge branch 'master' into rails-5-1

This commit is contained in:
domaindrivendev 2017-05-19 10:35:00 -07:00 committed by GitHub
commit 1b3a976313
6 changed files with 8 additions and 7 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
**/*/*.gem **/*/*.gem
**/*/*.sqlite3 **/*/*.sqlite3
**/*/public/assets **/*/public/assets
*.swp

View File

@ -1,13 +1,13 @@
PATH PATH
remote: rswag-api remote: rswag-api
specs: specs:
rswag-api (1.2.0) rswag-api (1.2.1)
rails (>= 3.1, < 5.2) rails (>= 3.1, < 5.2)
PATH PATH
remote: rswag-specs remote: rswag-specs
specs: specs:
rswag-specs (1.2.0) rswag-specs (1.2.1)
json (~> 1.8) json (~> 1.8)
json-schema (~> 2.2) json-schema (~> 2.2)
rails (>= 3.1, < 5.2) rails (>= 3.1, < 5.2)
@ -16,7 +16,7 @@ PATH
PATH PATH
remote: rswag-ui remote: rswag-ui
specs: specs:
rswag-ui (1.2.0) rswag-ui (1.2.1)
rails (>= 3.1, < 5.2) rails (>= 3.1, < 5.2)
GEM GEM

View File

@ -1,5 +1,5 @@
module Rswag module Rswag
module Api module Api
VERSION = '1.2.0' VERSION = '1.2.1'
end end
end end

View File

@ -1,5 +1,5 @@
module Rswag module Rswag
module Specs module Specs
VERSION = '1.2.0' VERSION = '1.2.1'
end end
end end

View File

@ -1,5 +1,5 @@
module Rswag module Rswag
module Ui module Ui
VERSION = '1.2.0' VERSION = '1.2.1'
end end
end end

View File

@ -1,3 +1,3 @@
module Rswag module Rswag
VERSION = '1.2.0' VERSION = '1.2.1'
end end