Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/app/graphql/types/work_item_type.rb b/app/graphql/types/work_item_type.rb
index 888f22b4dd3..1e58781dbb9 100644
--- a/app/graphql/types/work_item_type.rb
+++ b/app/graphql/types/work_item_type.rb
@@ -39,6 +39,18 @@ module Types
                                           description: 'Title of the work item.'
     field :updated_at, Types::TimeType, null: false,
                                         description: 'Timestamp of when the work item was last updated.'
+
+    field :create_note_email, GraphQL::Types::String,
+          null: true,
+          description: 'User specific email address for the work item.'
+
+    field :reference, GraphQL::Types::String, null: false,
+          description: 'Internal reference of the work item. Returned in shortened format by default.',
+          method: :to_reference do
+            argument :full, GraphQL::Types::Boolean, required: false, default_value: false,
+                     description: 'Boolean option specifying whether the reference should be returned in full.'
+          end
+
     field :widgets,
           [Types::WorkItems::WidgetInterface],
           null: true,
@@ -54,5 +66,9 @@ module Types
     def web_url
       Gitlab::UrlBuilder.build(object)
     end
+
+    def create_note_email
+      object.creatable_note_email_address(context[:current_user])
+    end
   end
 end