diff options
| -rw-r--r-- | app/assets/javascripts/lib/utils/logoutput_behaviours.js | 47 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 9 | ||||
| -rw-r--r-- | spec/frontend/fixtures/static/environments_logs.html | 102 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 1 |
5 files changed, 3 insertions, 160 deletions
diff --git a/app/assets/javascripts/lib/utils/logoutput_behaviours.js b/app/assets/javascripts/lib/utils/logoutput_behaviours.js deleted file mode 100644 index 41b57025cc9..00000000000 --- a/app/assets/javascripts/lib/utils/logoutput_behaviours.js +++ /dev/null @@ -1,47 +0,0 @@ -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); - } -} diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index ce3d6247d86..fb9dd7792c3 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -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: diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f36318676aa..37209f0054e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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 "" diff --git a/spec/frontend/fixtures/static/environments_logs.html b/spec/frontend/fixtures/static/environments_logs.html deleted file mode 100644 index 88bb0a3ed41..00000000000 --- a/spec/frontend/fixtures/static/environments_logs.html +++ /dev/null @@ -1,102 +0,0 @@ -<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> diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 2bd4750dffa..5ae042e4148 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -16,6 +16,7 @@ JSConsoleError = Class.new(StandardError) 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" ]) |