Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 12:08:32 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 12:08:32 +0300
commitc8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (patch)
treea6b5d07b456c9494eb68ed210af74b58dc699a26 /app/views/shared
parenteace733dca6e5c87315b42f42eb4d8f05934d6de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/hook_logs/_status_label.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/hook_logs/_status_label.html.haml b/app/views/shared/hook_logs/_status_label.html.haml
index 993880b7d6e..dfa5ecee448 100644
--- a/app/views/shared/hook_logs/_status_label.html.haml
+++ b/app/views/shared/hook_logs/_status_label.html.haml
@@ -1,3 +1,3 @@
- label_status = hook_log.success? ? 'badge-success' : 'badge-danger'
-%span{ class: "label #{label_status}" }
- = hook_log.response_status
+%span{ class: "badge #{label_status}" }
+ = hook_log.internal_error? ? _('Error') : hook_log.response_status