Add latest changes from gitlab-org/gitlab@master

12 files changed, 18 insertions, 18 deletions

diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index d42613edbb2..b83814560c7 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -207,7 +207,7 @@ templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/t
 ### Caching Nodejs dependencies
 
 Assuming your project is using [npm](https://www.npmjs.com/) or
-[Yarn](https://yarnpkg.com/en/) to install the Nodejs dependencies, the
+[Yarn](https://classic.yarnpkg.com/en/) to install the Nodejs dependencies, the
 following example defines `cache` globally so that all jobs inherit it.
 Nodejs modules are installed in `node_modules/` and are cached per-branch:
 
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index 07ffe5439e3..ccb6b60ecc9 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -55,7 +55,7 @@ Some credentials are required to be able to run `aws` commands:
 
 Instead of referencing an image hosted on the GitLab Registry, you are free to
 reference any other image hosted on any third-party registry, such as
-[Amazon Elastic Container Registry (ECR)](https://aws.amazon.com/ecr).
+[Amazon Elastic Container Registry (ECR)](https://aws.amazon.com/ecr/).
 
 To do so, please make sure to [push your image into your ECR
 repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index ae73957295f..dca8d030820 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -519,4 +519,4 @@ If:
 - This is the first time setting it up, carefully read
   [using Docker in Docker workflow](#use-docker-in-docker-workflow-with-docker-executor).
 - You are upgrading from v18.09 or earlier, read our
-  [upgrade guide](https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/).
+  [upgrade guide](https://about.gitlab.com/releases/2019/07/31/docker-in-docker-with-docker-19-dot-03/).
diff --git a/doc/ci/examples/artifactory_and_gitlab/index.md b/doc/ci/examples/artifactory_and_gitlab/index.md
index aceceb7881a..340c49a840f 100644
--- a/doc/ci/examples/artifactory_and_gitlab/index.md
+++ b/doc/ci/examples/artifactory_and_gitlab/index.md
@@ -12,7 +12,7 @@ date: 2017-08-15
 
 ## Introduction
 
-In this article, we will show how you can leverage the power of [GitLab CI/CD](https://about.gitlab.com/product/continuous-integration/)
+In this article, we show how you can leverage the power of [GitLab CI/CD](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/)
 to build a [Maven](https://maven.apache.org/) project, deploy it to [Artifactory](https://jfrog.com/artifactory/), and then use it from another Maven application as a dependency.
 
 You'll create two different projects:
diff --git a/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md b/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
index 946deb6a5ff..f59401c6f87 100644
--- a/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
+++ b/doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
@@ -387,8 +387,8 @@ Uploading artifacts to coordinator... ok            id=17095874 responseStatus=2
 ## Continuous Deployment
 
 We have our codebase built and tested on every push. To complete the full pipeline with Continuous Deployment,
-let's set up [free web hosting with AWS S3](https://aws.amazon.com/s/dm/optimization/server-side-test/free-tier/free_np/) and a job through which our build artifacts get
-deployed. GitLab also has a free static site hosting service we could use, [GitLab Pages](https://about.gitlab.com/product/pages/),
+let's set up [free web hosting with AWS S3](https://aws.amazon.com/free/) and a job through which our build artifacts get
+deployed. GitLab also has a free static site hosting service we can use, [GitLab Pages](https://about.gitlab.com/stages-devops-lifecycle/pages/),
 however Dark Nova specifically uses other AWS tools that necessitates using `AWS S3`.
 Read through this article that describes [deploying to both S3 and GitLab Pages](https://about.gitlab.com/blog/2016/08/26/ci-deployment-and-environments/)
 and further delves into the principles of GitLab CI/CD than discussed in this article.
diff --git a/doc/ci/examples/end_to_end_testing_webdriverio/index.md b/doc/ci/examples/end_to_end_testing_webdriverio/index.md
index 2b78dd60b8a..3402190c805 100644
--- a/doc/ci/examples/end_to_end_testing_webdriverio/index.md
+++ b/doc/ci/examples/end_to_end_testing_webdriverio/index.md
@@ -44,12 +44,12 @@ infrastructure is up and running, and that your units of code work well together
 
 ## Selenium and WebdriverIO
 
-[Selenium](http://www.seleniumhq.org/) is a piece of software that can control web browsers, e.g., to make them
+[Selenium](https://selenium.dev/) is a piece of software that can control web browsers, e.g., to make them
 visit a specific URL or interact with elements on the page. It can be programmatically controlled
 from a variety of programming languages. In this article we're going to be using the
 [WebdriverIO](https://webdriver.io/) JavaScript bindings, but the general concept should carry over
 pretty well to
-[other programming languages supported by Selenium](http://docs.seleniumhq.org/about/platforms.jsp#programming-languages).
+[other programming languages supported by Selenium](https://selenium.dev/about/platforms.jsp#programming-languages).
 
 ## Writing tests
 
diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
index 4ffb29af512..27e30dd3a10 100644
--- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
+++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
@@ -10,7 +10,7 @@ last_updated: 2019-03-06
 
 # Testing a Phoenix application with GitLab CI/CD
 
-[Phoenix](https://phoenixframework.org) is a web development framework written in [Elixir](https://elixir-lang.org), which is a
+[Phoenix](https://www.phoenixframework.org/) is a web development framework written in [Elixir](https://elixir-lang.org), which is a
 functional language designed for productivity and maintainability that runs on the
 [Erlang VM](https://www.erlang.org). Erlang VM is really really fast and can handle very large numbers of
 simultaneous users.
@@ -27,7 +27,7 @@ and the GitLab UI.
 
 ### What is Phoenix?
 
-[Phoenix](https://phoenixframework.org) is a web development framework written in [Elixir](https://elixir-lang.org) it's very useful
+[Phoenix](https://www.phoenixframework.org/) is a web development framework written in [Elixir](https://elixir-lang.org). It's useful
  for building fast, reliable, and high-performance applications, as it uses [Erlang VM](https://www.erlang.org).
 
 Many components and concepts are similar to Ruby on Rails or Python's Django. High developer
@@ -395,7 +395,7 @@ using GitLab CI/CD. The benefits to our teams will be huge!
 
 ## References
 
-- [GitLab CI/CD introductory guide](https://about.gitlab.com/blog/2015/12/14/getting-started-with-gitlab-and-gitlab-ci)
+- [GitLab CI/CD introductory guide](https://about.gitlab.com/blog/2015/12/14/getting-started-with-gitlab-and-gitlab-ci/)
 - [GitLab CI/CD full Documentation](../../README.md)
 - [GitLab Runners documentation](../../runners/README.md)
 - [Using Docker images documentation](../../docker/using_docker_images.md)
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index 1876681e372..d9aa52eb233 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -5,7 +5,7 @@ type: reference
 # Multi-project pipelines **(PREMIUM)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/2121) in
-[GitLab Premium 9.3](https://about.gitlab.com/blog/2017/06/22/gitlab-9-3-released/#multi-project-pipeline-graphs).
+[GitLab Premium 9.3](https://about.gitlab.com/releases/2017/06/22/gitlab-9-3-released/#multi-project-pipeline-graphs).
 
 When you set up [GitLab CI/CD](README.md) across multiple projects, you can visualize
 the entire pipeline, including all cross-project inter-dependencies.
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 90efae30925..6de3eaf8831 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -5,7 +5,7 @@ type: reference
 # Getting started with GitLab CI/CD
 
 NOTE: **Note:**
-Starting from version 8.0, GitLab [Continuous Integration](https://about.gitlab.com/product/continuous-integration/) (CI)
+Starting from version 8.0, GitLab [Continuous Integration](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/) (CI)
 is fully integrated into GitLab itself and is [enabled] by default on all
 projects.
 
@@ -17,7 +17,7 @@ NOTE: **Note:**
 Coming over to GitLab from Jenkins? Check out our [reference](../jenkins/index.md)
 for converting your pre-existing pipelines over to our format.
 
-GitLab offers a [continuous integration](https://about.gitlab.com/product/continuous-integration/) service. For each commit or push to trigger your CI
+GitLab offers a [continuous integration](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/) service. For each commit or push to trigger your CI
 [pipeline](../pipelines.md), you must:
 
 - Add a [`.gitlab-ci.yml` file](#creating-a-gitlab-ciyml-file) to your repository's root directory.
diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md
index e17adad52b6..414b0279c47 100644
--- a/doc/ci/triggers/README.md
+++ b/doc/ci/triggers/README.md
@@ -6,7 +6,7 @@ type: tutorial
 
 > **Notes**:
 >
-> - [Introduced](https://about.gitlab.com/blog/2015/08/22/gitlab-7-14-released/) in GitLab 7.14.
+> - [Introduced](https://about.gitlab.com/releases/2015/08/22/gitlab-7-14-released/) in GitLab 7.14.
 > - GitLab 8.12 has a completely redesigned job permissions system. Read all
 >   about the [new model and its implications](../../user/project/new_ci_build_permissions_model.md#pipeline-triggers).
 
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md
index f13ef767660..ba77a51a089 100644
--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -85,7 +85,7 @@ changes.
 - [HTML](style/html.md). Guidelines for writing HTML code consistent with the rest of the codebase.
 - [Vue](style/vue.md). Guidelines and conventions for Vue code may be found here.
 
-## Tooling
+## [Tooling](tooling.md)
 
 Our code is automatically formatted with [Prettier](https://prettier.io) to follow our guidelines. Read our [Tooling guide](tooling.md) for more detail.
 
diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb
index 792036273d6..182906a3337 100644
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
@@ -304,7 +304,6 @@ describe Projects::Operations::UpdateService do
             "title" => nil,
             "active" => true,
             "properties" => { "api_url" => "http://example.prometheus.com", "manual_configuration" => "0" },
-            "instance" => false,
             "push_events" => true,
             "issues_events" => true,
             "merge_requests_events" => true,
@@ -320,7 +319,8 @@ describe Projects::Operations::UpdateService do
             "confidential_note_events" => true,
             "deployment_events" => false,
             "description" => nil,
-            "comment_on_event_enabled" => true
+            "comment_on_event_enabled" => true,
+            "template" => false
           }
         end
         let(:params) do