BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
da6a3fb0
Commit
da6a3fb0
authored
Jun 29, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '34039-scroll-job' into 'master'
Job details won't scroll horizontally to show long lines Closes #34039 and #33638 See merge request !12518
parents
ff048ba8
6da858dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
build.js
app/assets/javascripts/build.js
+6
-1
builds.scss
app/assets/stylesheets/pages/builds.scss
+2
-3
No files found.
app/assets/javascripts/build.js
View file @
da6a3fb0
...
...
@@ -196,6 +196,7 @@ window.Build = (function () {
})
.
done
((
log
)
=>
{
gl
.
utils
.
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
if
(
log
.
state
)
{
this
.
state
=
log
.
state
;
}
...
...
@@ -220,7 +221,11 @@ window.Build = (function () {
}
if
(
!
log
.
complete
)
{
this
.
toggleScrollAnimation
(
true
);
if
(
!
this
.
hasBeenScrolled
)
{
this
.
toggleScrollAnimation
(
true
);
}
else
{
this
.
toggleScrollAnimation
(
false
);
}
Build
.
timeout
=
setTimeout
(()
=>
{
//eslint-disable-next-line
...
...
app/assets/stylesheets/pages/builds.scss
View file @
da6a3fb0
...
...
@@ -147,10 +147,9 @@
top
:
35px
;
left
:
10px
;
bottom
:
0
;
overflow-y
:
scroll
;
overflow-x
:
hidden
;
padding
:
10px
20px
20px
5px
;
white-space
:
pre
;
white-space
:
pre-wrap
;
overflow
:
auto
;
}
.environment-information
{
...
...
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