diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
| commit | f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (patch) | |
| tree | e53baffa847c4fd37c8e335e4d93d603c75f9f02 /doc/user/project | |
| parent | b98fa9ef3d5bead417ae2f325cb64637883264e9 (diff) | |
| download | gitlab-ce-f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/pages/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 11 |
2 files changed, 9 insertions, 4 deletions
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 |