Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
91733c8d
Commit
91733c8d
authored
Oct 07, 2021
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI polish on the webhook log page
Changelog: changed
parent
8495a310
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
36 deletions
+54
-36
app/views/projects/hook_logs/show.html.haml
app/views/projects/hook_logs/show.html.haml
+8
-8
app/views/shared/hook_logs/_content.html.haml
app/views/shared/hook_logs/_content.html.haml
+31
-28
locale/gitlab.pot
locale/gitlab.pot
+15
-0
No files found.
app/views/projects/hook_logs/show.html.haml
View file @
91733c8d
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
-
add_to_breadcrumbs
_
(
'Webhook Settings'
),
namespace_project_hooks_path
-
add_to_breadcrumbs
_
(
'Webhook Settings'
),
namespace_project_hooks_path
-
page_title
_
(
'Webhook Logs'
)
-
page_title
_
(
'Webhook Logs'
)
.row.gl-mt-3.gl-mb-3
%h3
.page-title
.col-lg-3
=
_
(
"Request details"
)
%h4
.gl-mt-0
=
_
(
"Request details"
)
%hr
.col-lg-9
=
link_to
_
(
'Resend Request'
),
@hook_log
.
present
.
retry_path
,
method: :post
,
class:
"btn gl-button btn-default float-right gl-ml-3"
=
link_to
_
(
"Resend Request"
),
@hook_log
.
present
.
retry_path
,
method: :post
,
class:
"btn gl-button btn-default float-right gl-ml-3"
=
render
partial:
'shared/hook_logs/content'
,
locals:
{
hook_log:
@hook_log
}
=
render
partial:
'shared/hook_logs/content'
,
locals:
{
hook_log:
@hook_log
}
app/views/shared/hook_logs/_content.html.haml
View file @
91733c8d
%p
%span
.gl-display-flex.gl-align-items-center
%strong
Request URL:
%h4
POST
POST
=
hook_log
.
url
=
hook_log
.
url
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
%span
.badge.gl-badge.badge-pill.badge-muted.sm.gl-ml-3
=
hook_log
.
trigger
.
singularize
.
titleize
%p
%p
%strong
Trigger:
=
_
(
'Completed in %{duration_seconds} seconds (%{relative_time})'
).
html_safe
%
{
duration_seconds:
number_with_precision
(
hook_log
.
execution_duration
,
precision:
2
),
relative_time:
time_ago_with_tooltip
(
hook_log
.
created_at
)
}
%td
.d-none.d-sm-block
%span
.badge.badge-gray.deploy-project-label
=
hook_log
.
trigger
.
singularize
.
titleize
%p
%strong
Elapsed time:
#{
number_with_precision
(
hook_log
.
execution_duration
,
precision:
2
)
}
sec
%p
%strong
Request time:
=
time_ago_with_tooltip
(
hook_log
.
created_at
)
%hr
%hr
-
if
hook_log
.
internal_error_message
.
present?
-
if
hook_log
.
internal_error_message
.
present?
.bs-callout.bs-callout-danger
.gl-alert-container
=
hook_log
.
internal_error_message
.gl-alert.gl-alert-danger
.gl-alert-container
=
sprite_icon
(
'error'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
.gl-alert-content
%h4
.gl-alert-title
=
_
(
'Internal error occured while delivering this webhook.'
)
.gl-alert-body
=
_
(
'Error: %{error}'
)
%
{
error:
hook_log
.
internal_error_message
}
%h4
=
_
(
'Response'
)
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
%pre
.gl-mt-3
:escaped
#{
hook_log
.
response_body
}
%h5
Request headers:
%h5
=
_
(
'Headers'
)
%pre
%pre
-
hook_log
.
re
quest
_headers
.
each
do
|
k
,
v
|
-
hook_log
.
re
sponse
_headers
.
each
do
|
k
,
v
|
<s
trong>
#{
k
}
:
</strong
>
#{
v
}
<s
pan
class=
"gl-font-weight-bold"
>
#{
k
}
:
</span
>
#{
v
}
%br
%br
%h
5
Request body:
%h
4
.gl-mt-6
=
_
(
'Request'
)
%pre
%pre
:escaped
:escaped
#{
Gitlab
::
Json
.
pretty_generate
(
hook_log
.
request_data
)
}
#{
Gitlab
::
Json
.
pretty_generate
(
hook_log
.
request_data
)
}
%h5
Response headers:
%h5
=
_
(
'Headers'
)
%pre
%pre
-
hook_log
.
re
sponse
_headers
.
each
do
|
k
,
v
|
-
hook_log
.
re
quest
_headers
.
each
do
|
k
,
v
|
<s
trong>
#{
k
}
:
</strong
>
#{
v
}
<s
pan
class=
"gl-font-weight-bold"
>
#{
k
}
:
</span
>
#{
v
}
%br
%br
%h5
Response body:
%pre
:escaped
#{
hook_log
.
response_body
}
locale/gitlab.pot
View file @
91733c8d
...
@@ -8488,6 +8488,9 @@ msgstr ""
...
@@ -8488,6 +8488,9 @@ msgstr ""
msgid "Completed"
msgid "Completed"
msgstr ""
msgstr ""
msgid "Completed in %{duration_seconds} seconds (%{relative_time})"
msgstr ""
msgid "Compliance framework"
msgid "Compliance framework"
msgstr ""
msgstr ""
...
@@ -13471,6 +13474,9 @@ msgstr ""
...
@@ -13471,6 +13474,9 @@ msgstr ""
msgid "Error: %{error_message}"
msgid "Error: %{error_message}"
msgstr ""
msgstr ""
msgid "Error: %{error}"
msgstr ""
msgid "Error: Couldn't load some or all of the changes."
msgid "Error: Couldn't load some or all of the changes."
msgstr ""
msgstr ""
...
@@ -16755,6 +16761,9 @@ msgstr ""
...
@@ -16755,6 +16761,9 @@ msgstr ""
msgid "Header must be associated with a request or response"
msgid "Header must be associated with a request or response"
msgstr ""
msgstr ""
msgid "Headers"
msgstr ""
msgid "Heading 1"
msgid "Heading 1"
msgstr ""
msgstr ""
...
@@ -18504,6 +18513,9 @@ msgstr ""
...
@@ -18504,6 +18513,9 @@ msgstr ""
msgid "Internal URL (optional)"
msgid "Internal URL (optional)"
msgstr ""
msgstr ""
msgid "Internal error occured while delivering this webhook."
msgstr ""
msgid "Internal users"
msgid "Internal users"
msgstr ""
msgstr ""
...
@@ -28946,6 +28958,9 @@ msgstr ""
...
@@ -28946,6 +28958,9 @@ msgstr ""
msgid "RepositorySettingsAccessLevel|Select"
msgid "RepositorySettingsAccessLevel|Select"
msgstr ""
msgstr ""
msgid "Request"
msgstr ""
msgid "Request Access"
msgid "Request Access"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment