Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
This commit is contained in:
commit
9da1f50974
1
Gemfile
1
Gemfile
|
@ -21,6 +21,7 @@ gem 'acts-as-taggable-on', '2.4.1'
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'grape-swagger'
|
gem 'grape-swagger'
|
||||||
|
gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
|
||||||
gem 'puma'
|
gem 'puma'
|
||||||
gem 'better_errors', path: 'lib/better_errors'
|
gem 'better_errors', path: 'lib/better_errors'
|
||||||
gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
|
gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
GIT
|
||||||
|
remote: https://github.com/guange2015/grape-swagger-ui.git
|
||||||
|
revision: 4c33439f236c174ae0e774b3435ef2547995c21d
|
||||||
|
specs:
|
||||||
|
grape-swagger-ui (0.0.4)
|
||||||
|
railties (>= 3.1)
|
||||||
|
|
||||||
PATH
|
PATH
|
||||||
remote: lib/better_errors
|
remote: lib/better_errors
|
||||||
specs:
|
specs:
|
||||||
|
@ -311,6 +318,7 @@ DEPENDENCIES
|
||||||
grape (~> 0.9.0)
|
grape (~> 0.9.0)
|
||||||
grape-entity
|
grape-entity
|
||||||
grape-swagger
|
grape-swagger
|
||||||
|
grape-swagger-ui!
|
||||||
guard-rails (~> 0.5.3)
|
guard-rails (~> 0.5.3)
|
||||||
guard-spork (~> 1.5.1)
|
guard-spork (~> 1.5.1)
|
||||||
guard-test (~> 1.0.0)
|
guard-test (~> 1.0.0)
|
||||||
|
|
Loading…
Reference in New Issue