Add latest changes from gitlab-org/gitlab@master

1 files changed, 35 insertions, 83 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ac3fbaddf8f..5b9cce59508 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
 ## Contributor License Agreement and Developer Certificate of Origin
 
-Contributions to this repository are subject to the [Developer Certificate of Origin](https://docs.gitlab.com/ee/legal/developer_certificate_of_origin.html#developer-certificate-of-origin-version-11), or the [Individual](https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html) or [Corporate](https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html) Contributor License Agreement, depending on where the contribution is made and on whose behalf:
+Contributions to this repository are subject to the [Developer Certificate of Origin](doc/legal/developer_certificate_of_origin.md#developer-certificate-of-origin-version-11), or the [Individual](doc/legal/individual_contributor_license_agreement.md) or [Corporate](doc/legal/corporate_contributor_license_agreement.md) Contributor License Agreement, depending on where the contribution is made and on whose behalf:
 
-- By submitting code contributions as an individual to the [`/ee` subdirectory](/ee) of this repository, you agree to the [Individual Contributor License Agreement](https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html).
+- By submitting code contributions as an individual to the [`/ee` subdirectory](/ee) of this repository, you agree to the [Individual Contributor License Agreement](doc/legal/individual_contributor_license_agreement.md).
 
-- By submitting code contributions on behalf of a corporation to the [`/ee` subdirectory](/ee) of this repository, you agree to the [Corporate Contributor License Agreement](https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html).
+- By submitting code contributions on behalf of a corporation to the [`/ee` subdirectory](/ee) of this repository, you agree to the [Corporate Contributor License Agreement](doc/legal/corporate_contributor_license_agreement.md).
 
-- By submitting code contributions as an individual or on behalf of a corporation to any directory in this repository outside of the [`/ee` subdirectory](/ee), you agree to the [Developer Certificate of Origin](https://docs.gitlab.com/ee/legal/developer_certificate_of_origin.html#developer-certificate-of-origin-version-11).
+- By submitting code contributions as an individual or on behalf of a corporation to any directory in this repository outside of the [`/ee` subdirectory](/ee), you agree to the [Developer Certificate of Origin](doc/legal/developer_certificate_of_origin.md#developer-certificate-of-origin-version-11).
 
 All Documentation content that resides under the [`doc/` directory](/doc) of this
 repository is licensed under Creative Commons:
@@ -17,124 +17,76 @@ _This notice should stay as the first item in the `CONTRIBUTING.md` file._
 ## Contributing Documentation has been moved
 
 As of July 2018, all the documentation for contributing to the GitLab project has been moved to a new location.
-[View the new documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
+[View the documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
 
 ## Contribute to GitLab
 
-[View the new documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
+[View the documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
 
 ## Security vulnerability disclosure
 
-This [documentation](doc/development/contributing/index.md#security-vulnerability-disclosure) has been moved.
+[View the documentation](doc/development/contributing/index.md#security-vulnerability-disclosure) to find the latest information.
 
 ## Code of Conduct
 
-This [documentation](https://about.gitlab.com/contributing/code-of-conduct/) has been moved.
+[View the documentation](https://about.gitlab.com/community/contribute/code-of-conduct/) to find the latest information.
 
 ## Closing policy for issues and merge requests
 
-This [documentation](doc/development/contributing/index.md#closing-policy-for-issues-and-merge-requests) has been moved.
+[View the documentation](doc/development/contributing/index.md#closing-policy-for-issues-and-merge-requests) to find the latest information.
 
 ## Helping others
 
-This [documentation](doc/development/contributing/index.md#helping-others) has been moved.
+[View the documentation](doc/development/contributing/index.md#helping-others) to find the latest information.
 
 ## I want to contribute!
 
-[View the new documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
+[View the documentation](https://about.gitlab.com/community/contribute/) to find the latest information.
 
 ## Contribution Flow
 
-This [documentation](doc/development/contributing/index.md) has been moved.
+[View the documentation](doc/development/contributing/index.md) to find the latest information.
 
 ## Workflow labels
 
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
+View the [issue workflow](doc/development/contributing/issue_workflow.md) documentation for these subjects:
 
-### Type labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Subject labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Team labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Release Scoping labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Priority labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Severity labels
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-#### Severity impact guidance
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Label for community contributors
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
+- Type labels
+- Subject labels
+- Team labels
+- Release Scoping labels
+- Priority labels
+- Severity labels
+  - Severity impact guidance
+- Labels for community contributors
 
 ## Implement design & UI elements
 
-This [documentation](doc/development/contributing/design.md) has been moved.
+[View the documentation](doc/development/contributing/design.md) to find the latest information.
 
 ## Issue tracker
 
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Issue triaging
+View the [issue workflow](doc/development/contributing/issue_workflow.md) documentation for the following subjects.
 
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Feature proposals
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Issue tracker guidelines
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Issue weight
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Regression issues
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Technical and UX debt
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
-
-### Stewardship
-
-This [documentation](doc/development/contributing/issue_workflow.md) has been moved.
+- Issue triaging
+- Feature proposals
+- Issue tracker guidelines
+- Issue weight
+- Regression issues
+- Technical and UX debt
+- Stewardship
 
 ## Merge requests
 
-This [documentation](doc/development/contributing/merge_request_workflow.md) has been moved.
-
-### Merge request guidelines
-
-This [documentation](doc/development/contributing/merge_request_workflow.md) has been moved.
-
-### Contribution acceptance criteria
+View the [merge request workflow](doc/development/contributing/merge_request_workflow.md) documentation for the following subjects.
 
-This [documentation](doc/development/contributing/merge_request_workflow.md) has been moved.
+- Merge request guidelines
+- Contribution acceptance criteria
 
 ## Definition of done
 
-This [documentation](doc/development/contributing/merge_request_workflow.md) has been moved.
+[View the documentation](doc/development/contributing/merge_request_workflow.md) to find the latest information.
 
 ## Style guides
 
-This [documentation](doc/development/contributing/style_guides.md) has been moved.
+[View the documentation](doc/development/contributing/style_guides.md) to find the latest information.