Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
008fa528414a
Commit
2b42397b
authored
Nov 27, 2019
by
GitLab Bot
Browse files
Add latest changes from gitlab-org/gitlab@master
parent
29c3a49a0f28
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/lib/utils/logoutput_behaviours.js
deleted
100644 → 0
View file @
29c3a49a
import
$
from
'
jquery
'
;
import
{
canScroll
,
isScrolledToBottom
,
isScrolledToTop
,
isScrolledToMiddle
,
toggleDisableButton
,
}
from
'
./scroll_utils
'
;
export
default
class
LogOutputBehaviours
{
constructor
()
{
// Scroll buttons
this
.
$scrollTopBtn
=
$
(
'
.js-scroll-up
'
);
this
.
$scrollBottomBtn
=
$
(
'
.js-scroll-down
'
);
this
.
$scrollTopBtn
.
off
(
'
click
'
).
on
(
'
click
'
,
this
.
scrollToTop
.
bind
(
this
));
this
.
$scrollBottomBtn
.
off
(
'
click
'
).
on
(
'
click
'
,
this
.
scrollToBottom
.
bind
(
this
));
}
toggleScroll
()
{
if
(
canScroll
())
{
if
(
isScrolledToMiddle
())
{
// User is in the middle of the log
toggleDisableButton
(
this
.
$scrollTopBtn
,
false
);
toggleDisableButton
(
this
.
$scrollBottomBtn
,
false
);
}
else
if
(
isScrolledToTop
())
{
// User is at Top of Log
toggleDisableButton
(
this
.
$scrollTopBtn
,
true
);
toggleDisableButton
(
this
.
$scrollBottomBtn
,
false
);
}
else
if
(
isScrolledToBottom
())
{
// User is at the bottom of the build log.
toggleDisableButton
(
this
.
$scrollTopBtn
,
false
);
toggleDisableButton
(
this
.
$scrollBottomBtn
,
true
);
}
}
else
{
toggleDisableButton
(
this
.
$scrollTopBtn
,
true
);
toggleDisableButton
(
this
.
$scrollBottomBtn
,
true
);
}
}
toggleScrollAnimation
(
toggle
)
{
this
.
$scrollBottomBtn
.
toggleClass
(
'
animate
'
,
toggle
);
}
}
doc/ci/yaml/README.md
View file @
008fa528
...
...
@@ -275,13 +275,13 @@ For more information, see see [Available settings for `services`](../docker/usin
`before_script`
is used to define a command that should be run before each
job, including deploy jobs, but after the restoration of any
[
artifacts
](
#artifacts
)
.
This must be an
an
array.
This must be an array.
Scripts specified in
`before_script`
are concatenated with any scripts specified
in the main
[
`script`
](
#script
)
, and executed together in a single shell.
`after_script`
is used to define the command that will be run after each
job, including failed ones. This must be an
an
array.
job, including failed ones. This must be an array.
Scripts specified in
`after_script`
are executed in a new shell, separate from any
`before_script`
or
`script`
scripts. As a result, they:
...
...
locale/gitlab.pot
View file @
008fa528
...
...
@@ -6524,15 +6524,6 @@ msgstr ""
msgid "Environments|An error occurred while fetching the environments."
msgstr ""
msgid "Environments|An error occurred while fetching the logs"
msgstr ""
msgid "Environments|An error occurred while fetching the logs - Error: %{message}"
msgstr ""
msgid "Environments|An error occurred while fetching the logs for this environment or pod. Please try again"
msgstr ""
msgid "Environments|An error occurred while making the request."
msgstr ""
...
...
spec/frontend/fixtures/static/environments_logs.html
deleted
100644 → 0
View file @
29c3a49a
<div
class=
"js-kubernetes-logs"
data-current-environment-name=
"production"
data-environments-path=
"/root/my-project/environments.json"
data-project-full-path=
"root/my-project"
data-environment-id=
1
>
<div
class=
"build-page-pod-logs"
>
<div
class=
"build-trace-container prepend-top-default"
>
<div
class=
"top-bar js-top-bar d-flex"
>
<div
class=
"row"
>
<div
class=
"form-group col-6"
role=
"group"
>
<label
class=
"d-block col-form-label-sm col-form-label"
>
Environment
</label>
<div
class=
"dropdown js-environment-dropdown d-flex"
>
<button
aria-expanded=
"false"
class=
"dropdown-menu-toggle d-flex align-content-center align-self-center"
data-toggle=
"dropdown"
type=
"button"
>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<div
class=
"dropdown-toggle-text"
>
</div>
</button>
<div
class=
"dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"
></div>
</div>
</div>
<div
class=
"form-group col-6"
role=
"group"
>
<label
class=
"d-block col-form-label-sm col-form-label"
>
Pod logs from
</label>
<div
class=
"dropdown js-pod-dropdown d-flex"
>
<button
aria-expanded=
"false"
class=
"dropdown-menu-toggle d-flex align-content-center align-self-center"
data-toggle=
"dropdown"
type=
"button"
>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<div
class=
"dropdown-toggle-text"
>
</div>
</button>
<div
class=
"dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"
></div>
</div>
</div>
</div>
<div
class=
"controllers align-self-end"
>
<div
class=
"has-tooltip controllers-buttons"
data-container=
"body"
data-placement=
"top"
title=
"Scroll to top"
>
<button
class=
"js-scroll-up btn-scroll btn-transparent btn-blank"
disabled
type=
"button"
></button>
</div>
<div
class=
"has-tooltip controllers-buttons"
data-container=
"body"
data-placement=
"top"
title=
"Scroll to bottom"
>
<button
class=
"js-scroll-down btn-scroll btn-transparent btn-blank"
disabled
type=
"button"
></button>
</div>
<div
class=
"refresh-control"
>
<div
class=
"has-tooltip controllers-buttons"
data-container=
"body"
data-placement=
"top"
title=
"Refresh"
>
<button
class=
"js-refresh-log btn btn-default btn-refresh h-32-px"
disabled
type=
"button"
></button>
</div>
</div>
</div>
</div>
<pre
class=
"build-trace"
id=
"build-trace"
>
<code
class=
"bash js-build-output"
></code>
<div
class=
"build-loader-animation js-build-refresh"
>
<div
class=
"dot"
></div>
<div
class=
"dot"
></div>
<div
class=
"dot"
></div>
</div>
</pre>
</div>
</div>
</div>
spec/support/capybara.rb
View file @
008fa528
...
...
@@ -16,6 +16,7 @@
JS_CONSOLE_FILTER
=
Regexp
.
union
([
'"[HMR] Waiting for update signal from WDS..."'
,
'"[WDS] Hot Module Replacement enabled."'
,
'"[WDS] Live Reloading enabled."'
,
"Download the Vue Devtools extension"
])
...
...
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