Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentation

# Conflicts:
#   doc/user/discussions/index.md

1 files changed, 17 insertions, 1 deletions

diff --git a/lib/api/version.rb b/lib/api/version.rb
index 74cd857f447..eca1b529094 100644
--- a/lib/api/version.rb
+++ b/lib/api/version.rb
@@ -2,13 +2,29 @@
 
 module API
   class Version < Grape::API
+    helpers ::API::Helpers::GraphqlHelpers
+
     before { authenticate! }
 
+    METADATA_QUERY = <<~EOF
+      {
+        metadata {
+          version
+          revision
+        }
+      }
+    EOF
+
     desc 'Get the version information of the GitLab instance.' do
       detail 'This feature was introduced in GitLab 8.13.'
     end
     get '/version' do
-      { version: Gitlab::VERSION, revision: Gitlab.revision }
+      conditionally_graphql!(
+        query: METADATA_QUERY,
+        context: { current_user: current_user },
+        transform: ->(result) { result.dig('data', 'metadata') },
+        fallback: -> { { version: Gitlab::VERSION, revision: Gitlab.revision } }
+      )
     end
   end
 end