From 23bc19cb73aad969c9636b8b935111645e809e54 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 25 Mar 2020 00:08:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/development/contributing/issue_workflow.md | 2 +- doc/development/database_review.md | 7 ------- doc/development/documentation/styleguide.md | 15 +++++++++------ 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'doc/development') diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 94cf1c223dd..31d99813061 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -14,7 +14,7 @@ see fit. ## Issue triaging -Our issue triage policies are [described in our handbook](https://about.gitlab.com/handbook/engineering/issue-triage/). +Our issue triage policies are [described in our handbook](https://about.gitlab.com/handbook/engineering/quality/issue-triage/). You are very welcome to help the GitLab team triage issues. We also organize [issue bash events](https://gitlab.com/gitlab-org/gitlab-foss/issues/17815) once every quarter. diff --git a/doc/development/database_review.md b/doc/development/database_review.md index 9c428c62434..0fdf255e266 100644 --- a/doc/development/database_review.md +++ b/doc/development/database_review.md @@ -45,13 +45,6 @@ A database **reviewer**'s role is to: reassign MR to the database **maintainer** suggested by Reviewer Roulette. -#### When there are no database maintainers available - -Currently we have a [critical shortage of database maintainers](https://gitlab.com/gitlab-org/gitlab/issues/29717). Until we are able to increase the number of database maintainers to support the volume of reviews, we have implemented this temporary solution. If the database **reviewer** cannot find an available database **maintainer** then: - -1. Assign the MR for a second review by a **database trainee maintainer** for further review. -1. Once satisfied with the review process and if the database **maintainer** is still not available, skip the database maintainer approval step and assign the merge request to a backend maintainer for final review and approval. - A database **maintainer**'s role is to: - Perform the final database review on the MR. diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md index 88f8b9b57d2..16a175ec115 100644 --- a/doc/development/documentation/styleguide.md +++ b/doc/development/documentation/styleguide.md @@ -972,6 +972,7 @@ The following are examples of source Markdown for menu items with their publishe 1. Go to **{book}** **Wiki** 1. Go to **{snippet}** **Snippets** 1. Go to **{users}** **Members** +1. Select the **More actions** **{ellipsis_v}** icon > **Hide stage** ``` 1. Go to **{home}** **Project overview > Details** @@ -986,6 +987,7 @@ The following are examples of source Markdown for menu items with their publishe 1. Go to **{book}** **Wiki** 1. Go to **{snippet}** **Snippets** 1. Go to **{users}** **Members** +1. Select the **More actions** **{ellipsis_v}** icon > **Hide stage** ## Alert boxes @@ -1364,17 +1366,18 @@ NOTE: **Note:** The [Product Manager for the relevant group](https://about.gitlab.com/handbook/product/categories/#devops-stages) must review and approve the addition or removal of any mentions of using feature flags before the doc change is merged. -The following is sample text for adding feature flag documentation for a feature: +The following is sample text for adding feature flag documentation for a feature that is +off by default: ````md -### Disabling the feature +### Enabling the feature -This feature comes with the `:feature_flag` feature flag enabled by default. However, in some cases -this feature is incompatible with old configuration. To turn off the feature while configuration is -migrated, ask a GitLab administrator with Rails console access to run the following command: +This feature comes with the `:feature_flag` feature flag disabled by default. In some cases, +this feature is incompatible with an old configuration. To turn on the feature, +ask a GitLab administrator with Rails console access to run the following command: ```ruby -Feature.disable(:feature_flag) +Feature.enable(:feature_flag) ``` ```` -- cgit v1.2.1