Resolve Gemfile.lock and Gemfile.rails5.lock

Signed-off-by: Rémy Coutable <remy@rymai.me>

Gemfile.lock

@@ -186,7 +186,6 @@ GEM
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
     ed25519 (1.2.4)
-<<<<<<< HEAD
     elasticsearch (5.0.3)
       elasticsearch-api (= 5.0.3)
       elasticsearch-transport (= 5.0.3)
@@ -200,8 +199,6 @@ GEM
     elasticsearch-transport (5.0.3)
       faraday
       multi_json
-=======
->>>>>>> upstream/master
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
@@ -542,10 +539,7 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-=======
->>>>>>> upstream/master
     net-ssh (5.0.1)
     netrc (0.11.0)
     nokogiri (1.8.2)
@@ -1050,12 +1044,9 @@ DEPENDENCIES
   doorkeeper-openid_connect (~> 1.3)
   dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
-<<<<<<< HEAD
   elasticsearch-api (= 5.0.3)
   elasticsearch-model (~> 0.1.9)
   elasticsearch-rails (~> 0.1.9)
-=======
->>>>>>> upstream/master
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
   factory_bot_rails (~> 4.8.2)
@@ -1131,10 +1122,7 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-<<<<<<< HEAD
   net-ntp
-=======
->>>>>>> upstream/master
   net-ssh (~> 5.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)

Gemfile.rails5.lock

@@ -188,7 +188,6 @@ GEM
     dropzonejs-rails (0.7.4)
       rails (> 3.1)
     ed25519 (1.2.4)
-<<<<<<< HEAD
     elasticsearch (5.0.3)
       elasticsearch-api (= 5.0.3)
       elasticsearch-transport (= 5.0.3)
@@ -202,8 +201,6 @@ GEM
     elasticsearch-transport (5.0.3)
       faraday
       multi_json
-=======
->>>>>>> upstream/master
     email_reply_trimmer (0.1.10)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
@@ -396,6 +393,10 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
+    graphiql-rails (1.4.10)
+      railties
+      sprockets-rails
+    graphql (1.8.2)
     grpc (1.11.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
@@ -537,10 +538,7 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.1)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-=======
->>>>>>> upstream/master
     net-ssh (5.0.1)
     netrc (0.11.0)
     nio4r (2.3.1)
@@ -1051,12 +1049,9 @@ DEPENDENCIES
   doorkeeper-openid_connect (~> 1.3)
   dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
-<<<<<<< HEAD
   elasticsearch-api (= 5.0.3)
   elasticsearch-model (~> 0.1.9)
   elasticsearch-rails (~> 0.1.9)
-=======
->>>>>>> upstream/master
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
   factory_bot_rails (~> 4.8.2)
@@ -1100,6 +1095,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)
   gssapi
   haml_lint (~> 0.26.0)
@@ -1130,10 +1127,7 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-<<<<<<< HEAD
   net-ntp
-=======
->>>>>>> upstream/master
   net-ssh (~> 5.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)