diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/job_artifacts.md | 13 | ||||
| -rw-r--r-- | doc/development/event_tracking/frontend.md | 26 | ||||
| -rw-r--r-- | doc/user/project/pages/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 11 |
4 files changed, 44 insertions, 8 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 0c0be1da3c0..54eab36b0bb 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -200,11 +200,18 @@ by the `gitlab:artifacts:migrate` script. ### Migrating from object storage to local storage +**In Omnibus installations:** + In order to migrate back to local storage: -1. Set both `direct_upload` and `background_upload` to false under the artifacts object storage settings. Don't forget to restart GitLab. -1. Run `rake gitlab:artifacts:migrate_to_local` on your console. -1. Disable `object_storage` for artifacts in `gitlab.rb`. Remember to restart GitLab afterwards. +1. Set both `direct_upload` and `background_upload` to false in `gitlab.rb`, under the artifacts object storage settings. +1. [reconfigure GitLab][]. +1. Run `gitlab-rake gitlab:artifacts:migrate_to_local`. +1. Disable object_storage for artifacts in `gitlab.rb`: + - Set `gitlab_rails['artifacts_object_store_enabled'] = false`. + - Comment out all other `artifacts_object_store` settings, including the entire + `artifacts_object_store_connection` section, including the closing `}`. +1. [reconfigure GitLab][]. ## Expiring artifacts diff --git a/doc/development/event_tracking/frontend.md b/doc/development/event_tracking/frontend.md index 4139bf2322d..42c82a745db 100644 --- a/doc/development/event_tracking/frontend.md +++ b/doc/development/event_tracking/frontend.md @@ -118,7 +118,31 @@ button.addEventListener('click', () => { ## Tests and test helpers -In Karma tests, you can use the following: +In Jest particularly in vue tests, you can use the following: + +```javascript +import { mockTracking } from 'helpers/tracking_helper'; + +describe('MyTracking', () => { + let spy; + + beforeEach(() => { + spy = mockTracking('_category_', wrapper.element, jest.spyOn); + }); + + it('tracks an event when clicked on feedback', () => { + wrapper.find('.discover-feedback-icon').trigger('click'); + + expect(spy).toHaveBeenCalledWith('_category_', 'click_button', { + label: 'security-discover-feedback-cta', + property: '0', + }); + }); +}); + +``` + +In obsolete Karma tests it's used as below: ```javascript import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper'; diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index cabde1f4e8d..4ebe37394b4 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -30,7 +30,7 @@ instances (GitLab Core, Starter, Premium, and Ultimate). <div class="col-md-9"> <p style="margin-top: 18px;"> To publish a website with Pages, you can use any Static Site Generator (SSG), -such as Jekyll, Hugo, Middleman, Harp, Hexo, and Brunch, just to name a few. You can also +such as Gatsby, Jekyll, Hugo, Middleman, Harp, Hexo, and Brunch, just to name a few. You can also publish any website written directly in plain HTML, CSS, and JavaScript.</p> <p>Pages does <strong>not</strong> support dynamic server-side processing, for instance, as <code>.php</code> and <code>.asp</code> requires. See this article to learn more about <a href="https://about.gitlab.com/blog/2016/06/03/ssg-overview-gitlab-pages-part-1-dynamic-x-static/">static websites vs dynamic websites</a>.</p> diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 96710e957ff..fe62f5e2185 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -182,9 +182,14 @@ If **Public pipelines** is disabled: > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9362) in GitLab 9.1. -If you want to auto-cancel all pending non-HEAD pipelines on branch, when -new pipeline will be created (after your Git push or manually from UI), -check **Auto-cancel pending pipelines** checkbox and save the changes. +If you want all pending non-HEAD pipelines on branches to auto-cancel each time +a new pipeline is created, such as after a Git push or manually from the UI, +you can enable this in the project settings: + +1. Go to **{settings}** **Settings > CI / CD**. +1. Expand **General Pipelines**. +1. Check the **Auto-cancel redundant, pending pipelines** checkbox. +1. Click **Save changes**. ## Pipeline Badges |