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>2023-02-02 21:09:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-02 21:09:47 +0300
commit0a9b6b99a9bdcacea434501320f1a8d131a33827 (patch)
treeb3fb338cec894837358b82635c90a52f5b8e0c3d /.gitlab
parentd944f09d3212ca8aad09b92dbbae7323ee634237 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml1
-rw-r--r--.gitlab/issue_templates/Feature Proposal - basic.md1
-rw-r--r--.gitlab/issue_templates/Feature Proposal - lean.md1
-rw-r--r--.gitlab/issue_templates/Feature proposal - detailed.md1
4 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 2864014e17e..54e7e063842 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -67,6 +67,7 @@ qa:update-qa-cache:
e2e:package-and-test:
extends:
+ - .production # this makes sure GITLAB_ALLOW_SEPARATE_CI_DATABASE is passed to the child pipeline
- .qa:rules:package-and-test
stage: qa
needs:
diff --git a/.gitlab/issue_templates/Feature Proposal - basic.md b/.gitlab/issue_templates/Feature Proposal - basic.md
index b447bcfe0ae..e9815d85f9b 100644
--- a/.gitlab/issue_templates/Feature Proposal - basic.md
+++ b/.gitlab/issue_templates/Feature Proposal - basic.md
@@ -9,6 +9,7 @@
<!-- Label reminders
Use the following resources to find the appropriate labels:
+- Use only one tier label choosing the lowest tier this is intended for
- https://gitlab.com/gitlab-org/gitlab/-/labels
- https://about.gitlab.com/handbook/product/categories/features/
-->
diff --git a/.gitlab/issue_templates/Feature Proposal - lean.md b/.gitlab/issue_templates/Feature Proposal - lean.md
index c902c254618..3997ffa5c85 100644
--- a/.gitlab/issue_templates/Feature Proposal - lean.md
+++ b/.gitlab/issue_templates/Feature Proposal - lean.md
@@ -48,6 +48,7 @@ Create tracking issue using the Snowplow event tracking template. See https://gi
<!-- Label reminders
Use the following resources to find the appropriate labels:
+- Use only one tier label choosing the lowest tier this is intended for
- https://gitlab.com/gitlab-org/gitlab/-/labels
- https://about.gitlab.com/handbook/product/categories/features/
-->
diff --git a/.gitlab/issue_templates/Feature proposal - detailed.md b/.gitlab/issue_templates/Feature proposal - detailed.md
index 9eac2ca27c5..dcf6d417155 100644
--- a/.gitlab/issue_templates/Feature proposal - detailed.md
+++ b/.gitlab/issue_templates/Feature proposal - detailed.md
@@ -125,6 +125,7 @@ In which enterprise tier should this feature go? See https://about.gitlab.com/ha
<!-- Label reminders - you should have one of each of the following labels.
Use the following resources to find the appropriate labels:
+- Use only one tier label choosing the lowest tier this is intended for
- https://gitlab.com/gitlab-org/gitlab/-/labels
- https://about.gitlab.com/handbook/product/categories/features/
-->