diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-06 10:03:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-06 10:03:34 +0000 |
| commit | af9cc234f2bf854de38e9730266a411f261918da (patch) | |
| tree | bf25d7590d728ee1daa6a179ad43db87301475b8 /Gemfile.lock | |
| parent | 7334b8556ba2ee06397293fd90ea04be8f3fccd2 (diff) | |
| parent | 9b65d4bb417fb4939289eab94487c894f0a62db6 (diff) | |
| download | gitlab-ce-af9cc234f2bf854de38e9730266a411f261918da.tar.gz | |
Merge branch 'bvl-graphql-start-34754' into 'master'
GraphQL setup: Basic Project and Merge request endpoint
Closes #34754
See merge request gitlab-org/gitlab-ce!19008
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4b57857bde7..334895351ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,6 +365,10 @@ GEM rake (~> 12) grape_logging (1.7.0) grape + graphiql-rails (1.4.10) + railties + sprockets-rails + graphql (1.8.1) grpc (1.11.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) @@ -1053,6 +1057,8 @@ DEPENDENCIES grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) + graphiql-rails (~> 1.4.10) + graphql (~> 1.8.0) grpc (~> 1.11.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) |