Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 23 deletions

diff --git a/app/graphql/types/error_tracking/sentry_detailed_error_type.rb b/app/graphql/types/error_tracking/sentry_detailed_error_type.rb
index af6d8818d90..e3ccf9e61c8 100644
--- a/app/graphql/types/error_tracking/sentry_detailed_error_type.rb
+++ b/app/graphql/types/error_tracking/sentry_detailed_error_type.rb
@@ -11,77 +11,87 @@ module Types
 
       field :id, GraphQL::ID_TYPE,
             null: false,
-            description: "ID (global ID) of the error"
+            description: 'ID (global ID) of the error'
       field :sentry_id, GraphQL::STRING_TYPE,
             method: :id,
             null: false,
-            description: "ID (Sentry ID) of the error"
+            description: 'ID (Sentry ID) of the error'
       field :title, GraphQL::STRING_TYPE,
             null: false,
-            description: "Title of the error"
+            description: 'Title of the error'
       field :type, GraphQL::STRING_TYPE,
             null: false,
-            description: "Type of the error"
+            description: 'Type of the error'
       field :user_count, GraphQL::INT_TYPE,
             null: false,
-            description: "Count of users affected by the error"
+            description: 'Count of users affected by the error'
       field :count, GraphQL::INT_TYPE,
             null: false,
-            description: "Count of occurrences"
+            description: 'Count of occurrences'
       field :first_seen, Types::TimeType,
             null: false,
-            description: "Timestamp when the error was first seen"
+            description: 'Timestamp when the error was first seen'
       field :last_seen, Types::TimeType,
             null: false,
-            description: "Timestamp when the error was last seen"
+            description: 'Timestamp when the error was last seen'
       field :message, GraphQL::STRING_TYPE,
             null: true,
-            description: "Sentry metadata message of the error"
+            description: 'Sentry metadata message of the error'
       field :culprit, GraphQL::STRING_TYPE,
             null: false,
-            description: "Culprit of the error"
+            description: 'Culprit of the error'
+      field :external_base_url, GraphQL::STRING_TYPE,
+            null: false,
+            description: 'External Base URL of the Sentry Instance'
       field :external_url, GraphQL::STRING_TYPE,
             null: false,
-            description: "External URL of the error"
+            description: 'External URL of the error'
       field :sentry_project_id, GraphQL::ID_TYPE,
             method: :project_id,
             null: false,
-            description: "ID of the project (Sentry project)"
+            description: 'ID of the project (Sentry project)'
       field :sentry_project_name, GraphQL::STRING_TYPE,
             method: :project_name,
             null: false,
-            description: "Name of the project affected by the error"
+            description: 'Name of the project affected by the error'
       field :sentry_project_slug, GraphQL::STRING_TYPE,
             method: :project_slug,
             null: false,
-            description: "Slug of the project affected by the error"
+            description: 'Slug of the project affected by the error'
       field :short_id, GraphQL::STRING_TYPE,
             null: false,
-            description: "Short ID (Sentry ID) of the error"
+            description: 'Short ID (Sentry ID) of the error'
       field :status, Types::ErrorTracking::SentryErrorStatusEnum,
             null: false,
-            description: "Status of the error"
+            description: 'Status of the error'
       field :frequency, [Types::ErrorTracking::SentryErrorFrequencyType],
             null: false,
-            description: "Last 24hr stats of the error"
+            description: 'Last 24hr stats of the error'
       field :first_release_last_commit, GraphQL::STRING_TYPE,
             null: true,
-            description: "Commit the error was first seen"
+            description: 'Commit the error was first seen'
       field :last_release_last_commit, GraphQL::STRING_TYPE,
             null: true,
-            description: "Commit the error was last seen"
+            description: 'Commit the error was last seen'
       field :first_release_short_version, GraphQL::STRING_TYPE,
             null: true,
-            description: "Release version the error was first seen"
+            description: 'Release version the error was first seen'
       field :last_release_short_version, GraphQL::STRING_TYPE,
             null: true,
-            description: "Release version the error was last seen"
+            description: 'Release version the error was last seen'
       field :gitlab_commit, GraphQL::STRING_TYPE,
             null: true,
-            description: "GitLab commit SHA attributed to the Error based on the release version"
+            description: 'GitLab commit SHA attributed to the Error based on the release version'
       field :gitlab_commit_path, GraphQL::STRING_TYPE,
             null: true,
-            description: "Path to the GitLab page for the GitLab commit attributed to the error"
+            description: 'Path to the GitLab page for the GitLab commit attributed to the error'
+      field :gitlab_issue_path, GraphQL::STRING_TYPE,
+            method: :gitlab_issue,
+            null: true,
+            description: 'URL of GitLab Issue'
+      field :tags, Types::ErrorTracking::SentryErrorTagsType,
+            null: false,
+            description: 'Tags associated with the Sentry Error'
 
       def first_seen
         DateTime.parse(object.first_seen)