diff options
| author | Daniel Axelrod <git@danonline.net> | 2016-11-02 00:45:15 +0000 |
|---|---|---|
| committer | Daniel Axelrod <git@danonline.net> | 2016-11-02 00:45:15 +0000 |
| commit | 6ed2434afab6dcdfb8f01f757e757dd1781c4713 (patch) | |
| tree | 536763b49d615fad6a5f55d4cb32ebf62cb182db | |
| parent | e2e3f196ac79beb1a79aff2ff94ddc1882bc76f4 (diff) | |
| download | gitlab-ce-6ed2434afab6dcdfb8f01f757e757dd1781c4713.tar.gz | |
Replace MR Description Format links
Replace links to the `Merge request description format` section with
up-to-date instructions on using the MR template built into the UI.
The `Merge request description format` section was removed in 2f7e28d1,
but links were left in the table of contents and in the MR description
instructions.
| -rw-r--r-- | CONTRIBUTING.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4635e50c28..89d6b3f5bdf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,6 @@ - [Technical debt](#technical-debt) - [Merge requests](#merge-requests) - [Merge request guidelines](#merge-request-guidelines) - - [Merge request description format](#merge-request-description-format) - [Contribution acceptance criteria](#contribution-acceptance-criteria) - [Changes for Stable Releases](#changes-for-stable-releases) - [Definition of done](#definition-of-done) @@ -262,8 +261,11 @@ request is as follows: 1. Submit a merge request (MR) to the `master` branch 1. The MR title should describe the change you want to make 1. The MR description should give a motive for your change and the method you - used to achieve it, see the [merge request description format] - (#merge-request-description-format) + used to achieve it. + 1. If you are contributing code, fill in the template already provided in the + "Description" field. + 1. If you are contributing documentation, choose `Documentation` from the + "Choose a template" menu and fill in the template. 1. If the MR changes the UI it should include *Before* and *After* screenshots 1. If the MR changes CSS classes please include the list of affected pages, `grep css-class ./app -R` |