Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index 21f487f09f7..64e698a0bc9 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -127,9 +127,11 @@ export default {
           <input name="issue[description]" :value="issueDescription" type="hidden" />
           <gl-form-input :value="csrfToken" class="hidden" name="authenticity_token" />
           <loading-button
+            v-if="!error.gitlab_issue"
             class="btn-success"
             :label="__('Create issue')"
             :loading="issueCreationInProgress"
+            data-qa-selector="create_issue_button"
             @click="createIssue"
           />
         </form>
@@ -140,6 +142,12 @@ export default {
         </tooltip-on-truncate>
         <h3>{{ __('Error details') }}</h3>
         <ul>
+          <li v-if="error.gitlab_issue">
+            <span class="bold">{{ __('GitLab Issue') }}:</span>
+            <gl-link :href="error.gitlab_issue">
+              <span>{{ error.gitlab_issue }}</span>
+            </gl-link>
+          </li>
           <li>
             <span class="bold">{{ __('Sentry event') }}:</span>
             <gl-link