Add latest changes from gitlab-org/gitlab@master

4 files changed, 48 insertions, 0 deletions

diff --git a/app/serializers/error_tracking/detailed_error_entity.rb b/app/serializers/error_tracking/detailed_error_entity.rb
new file mode 100644
index 00000000000..8f08f84aa41
--- /dev/null
+++ b/app/serializers/error_tracking/detailed_error_entity.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ErrorTracking
+  class DetailedErrorEntity < Grape::Entity
+    expose :count,
+           :culprit,
+           :external_base_url,
+           :external_url,
+           :first_release_last_commit,
+           :first_release_short_version,
+           :first_seen,
+           :frequency,
+           :id,
+           :last_release_last_commit,
+           :last_release_short_version,
+           :last_seen,
+           :message,
+           :project_id,
+           :project_name,
+           :project_slug,
+           :short_id,
+           :status,
+           :title,
+           :type,
+           :user_count
+  end
+end
diff --git a/app/serializers/error_tracking/detailed_error_serializer.rb b/app/serializers/error_tracking/detailed_error_serializer.rb
new file mode 100644
index 00000000000..201da16a1ae
--- /dev/null
+++ b/app/serializers/error_tracking/detailed_error_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ErrorTracking
+  class DetailedErrorSerializer < BaseSerializer
+    entity DetailedErrorEntity
+  end
+end
diff --git a/app/serializers/error_tracking/error_event_entity.rb b/app/serializers/error_tracking/error_event_entity.rb
new file mode 100644
index 00000000000..6cf0e6e3ae2
--- /dev/null
+++ b/app/serializers/error_tracking/error_event_entity.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ErrorTracking
+  class ErrorEventEntity < Grape::Entity
+    expose :issue_id, :date_received, :stack_trace_entries
+  end
+end
diff --git a/app/serializers/error_tracking/error_event_serializer.rb b/app/serializers/error_tracking/error_event_serializer.rb
new file mode 100644
index 00000000000..bc4eae16368
--- /dev/null
+++ b/app/serializers/error_tracking/error_event_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ErrorTracking
+  class ErrorEventSerializer < BaseSerializer
+    entity ErrorEventEntity
+  end
+end