diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-04-10 16:29:42 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-04-10 16:29:42 +0000 |
| commit | 909750629a89da5431faf90f491b274cff6855a1 (patch) | |
| tree | daa06fd62bdaee170c75052511dc4e26da667f47 | |
| parent | 490b31f740d23b54a62588cd9fd0e0cf7fdd9370 (diff) | |
| parent | 78654a8c6aea0fc6cfdf82e191dfc209e0adb4e2 (diff) | |
| download | gitlab-ce-909750629a89da5431faf90f491b274cff6855a1.tar.gz | |
Merge branch 'update-issue_workflow-docs' into 'master'
Add missing team and stage labels in the workflow labels doc
See merge request gitlab-org/gitlab-ce!27224
| -rw-r--r-- | doc/development/contributing/issue_workflow.md | 4 | ||||
| -rw-r--r-- | doc/development/testing_guide/flaky_tests.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 4c53643ed9c..827b3d7681a 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -62,10 +62,12 @@ The current team labels are: - ~Configure - ~Create +- ~Defend - ~Distribution - ~Documentation - ~Geo - ~Gitaly +- ~Growth - ~Manage - ~Monitor - ~Plan @@ -99,6 +101,8 @@ The current stage labels are: - ~"devops:configure" - ~"devops:monitor" - ~"devops:secure" +- ~"devops:defend" +- ~"devops:enablement" These labels should be mutually exclusive. If an issue belongs to multiple stages, the most relevant should be used. diff --git a/doc/development/testing_guide/flaky_tests.md b/doc/development/testing_guide/flaky_tests.md index 3d568c37fba..931cbc51cae 100644 --- a/doc/development/testing_guide/flaky_tests.md +++ b/doc/development/testing_guide/flaky_tests.md @@ -8,7 +8,7 @@ eventually. ## Quarantined tests When a test frequently fails in `master`, -[a ~"broken master" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master) +[a ~"master:broken" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master) should be created. If the test cannot be fixed in a timely fashion, there is an impact on the productivity of all the developers, so it should be placed in quarantine by @@ -21,7 +21,7 @@ bin/rspec --tag quarantine ``` **Before putting a test in quarantine, you should make sure that a -~"broken master" issue exists for it so it won't stay in quarantine forever.** +~"master:broken" issue exists for it so it won't stay in quarantine forever.** Once a test is in quarantine, there are 3 choices: |