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
33c49265
Commit
33c49265
authored
Sep 04, 2020
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace 'job trace' with 'job logs' in error messages
parent
9edfdaac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
...ssets/javascripts/ide/stores/modules/pipelines/actions.js
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/frontend/ide/stores/modules/pipelines/actions_spec.js
spec/frontend/ide/stores/modules/pipelines/actions_spec.js
+1
-1
No files found.
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @
33c49265
...
...
@@ -123,7 +123,7 @@ export const receiveJobLogsError = ({ commit, dispatch }) => {
dispatch
(
'
setErrorMessage
'
,
{
text
:
__
(
'
An error occurred while fetching the job
trace
.
'
),
text
:
__
(
'
An error occurred while fetching the job
logs
.
'
),
action
:
()
=>
dispatch
(
'
fetchJobLogs
'
).
then
(()
=>
dispatch
(
'
setErrorMessage
'
,
null
,
{
root
:
true
})),
actionText
:
__
(
'
Please try again
'
),
...
...
locale/gitlab.pot
View file @
33c49265
...
...
@@ -2702,7 +2702,7 @@ msgstr ""
msgid "An error occurred while fetching the job log."
msgstr ""
msgid "An error occurred while fetching the job
trace
."
msgid "An error occurred while fetching the job
logs
."
msgstr ""
msgid "An error occurred while fetching the job."
...
...
spec/frontend/ide/stores/modules/pipelines/actions_spec.js
View file @
33c49265
...
...
@@ -341,7 +341,7 @@ describe('IDE pipelines actions', () => {
{
type
:
'
setErrorMessage
'
,
payload
:
{
text
:
'
An error occurred while fetching the job
trace
.
'
,
text
:
'
An error occurred while fetching the job
logs
.
'
,
action
:
expect
.
any
(
Function
),
actionText
:
'
Please try again
'
,
actionPayload
:
null
,
...
...
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