Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 42 insertions, 0 deletions

diff --git a/app/graphql/types/timelog_type.rb b/app/graphql/types/timelog_type.rb
new file mode 100644
index 00000000000..465e3c492bc
--- /dev/null
+++ b/app/graphql/types/timelog_type.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Types
+  class TimelogType < BaseObject
+    graphql_name 'Timelog'
+
+    authorize :read_group_timelogs
+
+    field :spent_at,
+          Types::TimeType,
+          null: true,
+          description: 'Timestamp of when the time tracked was spent at.'
+
+    field :time_spent,
+          GraphQL::INT_TYPE,
+          null: false,
+          description: 'The time spent displayed in seconds.'
+
+    field :user,
+          Types::UserType,
+          null: false,
+          description: 'The user that logged the time.'
+
+    field :issue,
+          Types::IssueType,
+          null: true,
+          description: 'The issue that logged time was added to.'
+
+    field :note,
+          Types::Notes::NoteType,
+          null: true,
+          description: 'The note where the quick action to add the logged time was executed.'
+
+    def user
+      Gitlab::Graphql::Loaders::BatchModelLoader.new(User, object.user_id).find
+    end
+
+    def issue
+      Gitlab::Graphql::Loaders::BatchModelLoader.new(Issue, object.issue_id).find
+    end
+  end
+end