Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-21 12:10:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-21 12:10:07 +0300
commit3ab7e70965fd198aafefc5c1a0eaf7b695f6cabc (patch)
tree593e1a222df77d6da95ece78f24e995fb95f0fee /doc/ci/examples
parent38eb51cae9ad5a9ae87d824026362f323c500cb2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/examples')
-rw-r--r--doc/ci/examples/authenticating-with-hashicorp-vault/index.md2
-rw-r--r--doc/ci/examples/test-and-deploy-python-application-to-heroku.md9
-rw-r--r--doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md9
-rw-r--r--doc/ci/examples/test-clojure-application.md9
4 files changed, 1 insertions, 28 deletions
diff --git a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
index fc1e06e91c6..410d5ff5100 100644
--- a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
+++ b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
@@ -47,7 +47,7 @@ The JWT's payload looks like this:
"project_id": "22", #
"project_path": "mygroup/myproject", #
"user_id": "42", # Id of the user executing the job
- "user_login": "myuser" # GitLab @username
+ "user_login": "myuser", # GitLab @username
"user_email": "myuser@example.com", # Email of the user executing the job
"pipeline_id": "1212", #
"pipeline_source": "web", # Pipeline source, see: https://docs.gitlab.com/ee/ci/yaml/#common-if-clauses-for-rules
diff --git a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
deleted file mode 100644
index 94cfb8c1c58..00000000000
--- a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'README.md#contributed-examples'
-remove_date: '2021-06-01'
----
-
-This document was moved to [another location](README.md#contributed-examples).
-
-<!-- This redirect file can be deleted after 2021-06-01. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
deleted file mode 100644
index 94cfb8c1c58..00000000000
--- a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'README.md#contributed-examples'
-remove_date: '2021-06-01'
----
-
-This document was moved to [another location](README.md#contributed-examples).
-
-<!-- This redirect file can be deleted after 2021-06-01. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/ci/examples/test-clojure-application.md b/doc/ci/examples/test-clojure-application.md
deleted file mode 100644
index cb4040212ad..00000000000
--- a/doc/ci/examples/test-clojure-application.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'README.md#contributed-examples'
-remove_date: '2021-05-26'
----
-
-This document was moved to [another location](README.md#contributed-examples).
-
-<!-- This redirect file can be deleted after 2021-05-26. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->