kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-02-13 06:09:07 +00:00
parent 56a7627af0
commit 31a49d9244
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ci/caching/index.md
View File

@ -207,7 +207,7 @@ templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/t
### Caching Nodejs dependencies ### Caching Nodejs dependencies
Assuming your project is using [npm](https://www.npmjs.com/) or 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. following example defines `cache` globally so that all jobs inherit it.
Nodejs modules are installed in `node_modules/` and are cached per-branch: Nodejs modules are installed in `node_modules/` and are cached per-branch:

2
doc/ci/cloud_deployment/index.md
View File

@ -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 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 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 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) repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)

2
doc/ci/docker/using_docker_build.md
View File

@ -519,4 +519,4 @@ If:
- This is the first time setting it up, carefully read - This is the first time setting it up, carefully read
[using Docker in Docker workflow](#use-docker-in-docker-workflow-with-docker-executor). [using Docker in Docker workflow](#use-docker-in-docker-workflow-with-docker-executor).
- You are upgrading from v18.09 or earlier, read our - 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/).

2
doc/ci/examples/artifactory_and_gitlab/index.md
View File

@ -12,7 +12,7 @@ date: 2017-08-15
## Introduction ## 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. 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: You'll create two different projects:

4
doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md
View File

@ -387,8 +387,8 @@ Uploading artifacts to coordinator... ok id=17095874 responseStatus=2
## Continuous Deployment ## Continuous Deployment
We have our codebase built and tested on every push. To complete the full pipeline with 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 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 could use, [GitLab Pages](https://about.gitlab.com/product/pages/), 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`. 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/) 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. and further delves into the principles of GitLab CI/CD than discussed in this article.

4
doc/ci/examples/end_to_end_testing_webdriverio/index.md
View File

@ -44,12 +44,12 @@ infrastructure is up and running, and that your units of code work well together
## Selenium and WebdriverIO ## 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 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 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 [WebdriverIO](https://webdriver.io/) JavaScript bindings, but the general concept should carry over
pretty well to 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 ## Writing tests

6
doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
View File

@ -10,7 +10,7 @@ last_updated: 2019-03-06
# Testing a Phoenix application with GitLab CI/CD # 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 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 [Erlang VM](https://www.erlang.org). Erlang VM is really really fast and can handle very large numbers of
simultaneous users. simultaneous users.
@ -27,7 +27,7 @@ and the GitLab UI.
### What is Phoenix? ### 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). 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 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 ## 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 CI/CD full Documentation](../../README.md)
- [GitLab Runners documentation](../../runners/README.md) - [GitLab Runners documentation](../../runners/README.md)
- [Using Docker images documentation](../../docker/using_docker_images.md) - [Using Docker images documentation](../../docker/using_docker_images.md)

2
doc/ci/multi_project_pipelines.md
View File

@ -5,7 +5,7 @@ type: reference
# Multi-project pipelines **(PREMIUM)** # Multi-project pipelines **(PREMIUM)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/2121) in > [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 When you set up [GitLab CI/CD](README.md) across multiple projects, you can visualize
the entire pipeline, including all cross-project inter-dependencies. the entire pipeline, including all cross-project inter-dependencies.

4
doc/ci/quick_start/README.md
View File

@ -5,7 +5,7 @@ type: reference
# Getting started with GitLab CI/CD # Getting started with GitLab CI/CD
NOTE: **Note:** 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 is fully integrated into GitLab itself and is [enabled] by default on all
projects. projects.
@ -17,7 +17,7 @@ NOTE: **Note:**
Coming over to GitLab from Jenkins? Check out our [reference](../jenkins/index.md) Coming over to GitLab from Jenkins? Check out our [reference](../jenkins/index.md)
for converting your pre-existing pipelines over to our format. 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: [pipeline](../pipelines.md), you must:
- Add a [`.gitlab-ci.yml` file](#creating-a-gitlab-ciyml-file) to your repository's root directory. - Add a [`.gitlab-ci.yml` file](#creating-a-gitlab-ciyml-file) to your repository's root directory.

2
doc/ci/triggers/README.md
View File

@ -6,7 +6,7 @@ type: tutorial
> **Notes**: > **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 > - 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). > about the [new model and its implications](../../user/project/new_ci_build_permissions_model.md#pipeline-triggers).

2
doc/development/fe_guide/index.md
View File

@ -85,7 +85,7 @@ changes.
- [HTML](style/html.md). Guidelines for writing HTML code consistent with the rest of the codebase. - [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. - [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. Our code is automatically formatted with [Prettier](https://prettier.io) to follow our guidelines. Read our [Tooling guide](tooling.md) for more detail.

4
spec/services/projects/operations/update_service_spec.rb
View File

@ -304,7 +304,6 @@ describe Projects::Operations::UpdateService do
"title" => nil, "title" => nil,
"active" => true, "active" => true,
"properties" => { "api_url" => "http://example.prometheus.com", "manual_configuration" => "0" }, "properties" => { "api_url" => "http://example.prometheus.com", "manual_configuration" => "0" },
"instance" => false,
"push_events" => true, "push_events" => true,
"issues_events" => true, "issues_events" => true,
"merge_requests_events" => true, "merge_requests_events" => true,
@ -320,7 +319,8 @@ describe Projects::Operations::UpdateService do
"confidential_note_events" => true, "confidential_note_events" => true,
"deployment_events" => false, "deployment_events" => false,
"description" => nil, "description" => nil,
"comment_on_event_enabled" => true "comment_on_event_enabled" => true,
"template" => false
} }
end end
let(:params) do let(:params) do