Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
00c4a96a
Commit
00c4a96a
authored
6 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Plain Diff
Merge branch 'error-report-timestamp-fix' into 'master'
fixed timestamp issue See merge request
!594
parents
d386a0b2
0f747012
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!630
WIP: Resolve "The privileges of a new user are not saved in some cases"
,
!594
fixed timestamp issue
Pipeline
#8507
passed
6 years ago
Changes
1
Pipelines
7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend-js/src/main/js/GuiConnector.js
+2
-2
2 additions, 2 deletions
frontend-js/src/main/js/GuiConnector.js
with
2 additions
and
2 deletions
frontend-js/src/main/js/GuiConnector.js
+
2
−
2
View file @
00c4a96a
...
@@ -290,7 +290,7 @@ GuiConnector.prototype.gatherReportData = function () {
...
@@ -290,7 +290,7 @@ GuiConnector.prototype.gatherReportData = function () {
tooltip
:
'
Your browser user agent. Many issues are specific to certain browsers. This information is important to identify those.
'
tooltip
:
'
Your browser user agent. Many issues are specific to certain browsers. This information is important to identify those.
'
},
},
timestamp
:
{
timestamp
:
{
value
:
+
new
Date
(),
value
:
Math
.
floor
(
+
new
Date
()
/
1000
)
,
tooltip
:
'
The error time. This information is useful to link the issue to a specific event on the server.
'
tooltip
:
'
The error time. This information is useful to link the issue to a specific event on the server.
'
}
// TODO: Submission time rather than server time for now
}
// TODO: Submission time rather than server time for now
};
};
...
@@ -339,7 +339,7 @@ GuiConnector.prototype.alert = function (error, redirectIfSecurityError) {
...
@@ -339,7 +339,7 @@ GuiConnector.prototype.alert = function (error, redirectIfSecurityError) {
self
.
_errorDialogData
.
innerHTML
+=
'
<textarea id="report-comment" maxlength="255" placeholder="Add comment..."></textarea>
'
;
self
.
_errorDialogData
.
innerHTML
+=
'
<textarea id="report-comment" maxlength="255" placeholder="Add comment..."></textarea>
'
;
Object
.
keys
(
data
).
forEach
(
function
(
key
)
{
Object
.
keys
(
data
).
forEach
(
function
(
key
)
{
self
.
_errorDialogData
.
innerHTML
+=
'
<label>
'
+
self
.
_errorDialogData
.
innerHTML
+=
'
<label>
'
+
(
key
===
'
timestamp
'
?
new
Date
(
data
[
key
].
value
)
:
data
[
key
].
value
)
+
(
key
===
'
timestamp
'
?
new
Date
(
data
[
key
].
value
*
1000
)
:
data
[
key
].
value
)
+
'
<input class="report-check" type="checkbox" data-key="
'
+
key
+
'
" data-value="
'
+
data
[
key
].
value
+
'
"/>
'
+
'
<input class="report-check" type="checkbox" data-key="
'
+
key
+
'
" data-value="
'
+
data
[
key
].
value
+
'
"/>
'
+
'
<span class="ui-icon ui-icon-info" title="
'
+
data
[
key
].
tooltip
+
'
"></span>
'
+
'
<span class="ui-icon ui-icon-info" title="
'
+
data
[
key
].
tooltip
+
'
"></span>
'
+
'
</label>
'
;
'
</label>
'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment