Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-27 09:09:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-27 09:09:47 +0300
commitb505d34cfffb03e1b9b718e01c3d85221683a695 (patch)
tree899f4aa884d4fad7b96b77254d7764eb5c7180ac /app
parentd99ae624301a81cf0d2efa73d91cac07313ae949 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/graphql/types/user_type.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/graphql/types/user_type.rb b/app/graphql/types/user_type.rb
index ddba6589474..c5433a96c6a 100644
--- a/app/graphql/types/user_type.rb
+++ b/app/graphql/types/user_type.rb
@@ -20,6 +20,8 @@ module Types
description: 'State of the user'
field :email, GraphQL::STRING_TYPE, null: true,
description: 'User email'
+ field :public_email, GraphQL::STRING_TYPE, null: true,
+ description: "User's public email"
field :avatar_url, GraphQL::STRING_TYPE, null: true,
description: "URL of the user's avatar"
field :web_url, GraphQL::STRING_TYPE, null: false,