diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-01-24 20:38:06 +0100 |
|---|---|---|
| committer | John Doe <axil@gitlab.com> | 2017-12-22 07:52:30 +0100 |
| commit | 8b75299bcb909472cc68d18976d86a989db2aa7b (patch) | |
| tree | 622c1df230d1e61655dd20cadd52f327c9cfe405 | |
| parent | 620f46e68bed60229e766e2c82544bc77de8c29e (diff) | |
| download | gitlab-ce-8b75299bcb909472cc68d18976d86a989db2aa7b.tar.gz | |
Fix Grape definition
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -80,6 +80,8 @@ gem 'grape', '~> 1.0' gem 'grape-entity', '~> 0.6.0' gem 'grape-swagger' gem 'grape-swagger-rails' +gem 'grape-swagger-entity' +gem 'grape-swagger-representable' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Disable strong_params so that Mash does not respond to :permitted? diff --git a/Gemfile.lock b/Gemfile.lock index 1f6ac69e53c..4d4aae63734 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,8 +362,14 @@ GEM rake grape-swagger (0.27.3) grape (>= 0.16.2) + grape-swagger-entity (0.2.3) + grape-entity (>= 0.5.0) + grape-swagger (>= 0.20.4) grape-swagger-rails (0.3.0) railties (>= 3.2.12) + grape-swagger-representable (0.1.5) + grape-swagger (>= 0.20.4) + representable grape_logging (1.7.0) grape grpc (1.4.5) @@ -1060,7 +1066,9 @@ DEPENDENCIES grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape-swagger + grape-swagger-entity grape-swagger-rails + grape-swagger-representable grape_logging (~> 1.7) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) |