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
c2889d55
Commit
c2889d55
authored
Oct 21, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename trace to log in the UI
parent
c8f5576c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
10 deletions
+15
-10
app/helpers/builds_helper.rb
app/helpers/builds_helper.rb
+2
-2
app/views/projects/_export.html.haml
app/views/projects/_export.html.haml
+1
-1
app/views/projects/settings/ci_cd/_form.html.haml
app/views/projects/settings/ci_cd/_form.html.haml
+1
-1
changelogs/unreleased/29121-rename-trace.yml
changelogs/unreleased/29121-rename-trace.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+4
-4
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+2
-2
No files found.
app/helpers/builds_helper.rb
View file @
c2889d55
...
...
@@ -4,12 +4,12 @@ module BuildsHelper
def
build_summary
(
build
,
skip:
false
)
if
build
.
has_trace?
if
skip
link_to
_
(
"View job
trace
"
),
pipeline_job_url
(
build
.
pipeline
,
build
)
link_to
_
(
"View job
log
"
),
pipeline_job_url
(
build
.
pipeline
,
build
)
else
build
.
trace
.
html
(
last_lines:
10
).
html_safe
end
else
_
(
"No job
trace
"
)
_
(
"No job
log
"
)
end
end
...
...
app/views/projects/_export.html.haml
View file @
c2889d55
...
...
@@ -14,7 +14,7 @@
%li
=
desc
%p
=
_
(
'The following items will NOT be exported:'
)
%ul
%li
=
_
(
'Job
trace
s and artifacts'
)
%li
=
_
(
'Job
log
s and artifacts'
)
%li
=
_
(
'Container registry images'
)
%li
=
_
(
'CI variables'
)
%li
=
_
(
'Webhooks'
)
...
...
app/views/projects/settings/ci_cd/_form.html.haml
View file @
c2889d55
...
...
@@ -98,7 +98,7 @@
%span
.input-group-append
.input-group-text
/
%p
.form-text.text-muted
=
_
(
"A regular expression that will be used to find the test coverage output in the job
trace
. Leave blank to disable"
)
=
_
(
"A regular expression that will be used to find the test coverage output in the job
log
. Leave blank to disable"
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/pipelines/settings'
,
anchor:
'test-coverage-parsing'
),
target:
'_blank'
.bs-callout.bs-callout-info
%p
=
_
(
"Below are examples of regex for existing tools:"
)
...
...
changelogs/unreleased/29121-rename-trace.yml
0 → 100644
View file @
c2889d55
---
title
:
Replace wording trace with log
merge_request
:
author
:
type
:
changed
locale/gitlab.pot
View file @
c2889d55
...
...
@@ -686,7 +686,7 @@ msgstr ""
msgid "A ready-to-go template for use with iOS Swift apps."
msgstr ""
msgid "A regular expression that will be used to find the test coverage output in the job
trace
. Leave blank to disable"
msgid "A regular expression that will be used to find the test coverage output in the job
log
. Leave blank to disable"
msgstr ""
msgid "A secure token that identifies an external storage request."
...
...
@@ -9339,7 +9339,7 @@ msgstr ""
msgid "Job is stuck. Check runners."
msgstr ""
msgid "Job
trace
s and artifacts"
msgid "Job
log
s and artifacts"
msgstr ""
msgid "Job was retried"
...
...
@@ -10992,7 +10992,7 @@ msgstr ""
msgid "No issues for the selected time period."
msgstr ""
msgid "No job
trace
"
msgid "No job
log
"
msgstr ""
msgid "No jobs to show"
...
...
@@ -18390,7 +18390,7 @@ msgstr ""
msgid "View job"
msgstr ""
msgid "View job
trace
"
msgid "View job
log
"
msgstr ""
msgid "View jobs"
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
c2889d55
...
...
@@ -778,10 +778,10 @@ describe 'Pipeline', :js do
expect
(
page
).
to
have_content
(
failed_build
.
stage
)
end
it
'does not show
trace
'
do
it
'does not show
log
'
do
subject
expect
(
page
).
to
have_content
(
'No job
trace
'
)
expect
(
page
).
to
have_content
(
'No job
log
'
)
end
end
...
...
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