summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-09-28 10:23:11 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-09-28 10:23:11 +0000
commit790eabcaf4a703d2776a0c6e0c461d35598e37b1 (patch)
treefe2ac91ae5fa20f1ff20c3a51a1c9cb6ece33ce2
parentba66e0cc9cc26df686ed47d926a3edcde497baa1 (diff)
parentd55f7a12e59fe3f574781dfa1add5106483676e3 (diff)
downloadgitlab-ce-790eabcaf4a703d2776a0c6e0c461d35598e37b1.tar.gz
Merge branch 'patch-28' into 'master'
Documentation: Fix broken link of feature proposal template in issue_workflow.md See merge request gitlab-org/gitlab-ce!21894
-rw-r--r--doc/development/contributing/issue_workflow.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index 7ba8e3dce95..fed29d37b26 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -177,7 +177,7 @@ If you've decided that you would like to work on an issue, please @-mention
the [appropriate product manager](https://about.gitlab.com/handbook/product/#who-to-talk-to-for-what)
as soon as possible. The product manager will then pull in appropriate GitLab team
members to further discuss scope, design, and technical considerations. This will
-ensure that that your contribution is aligned with the GitLab product and minimize
+ensure that your contribution is aligned with the GitLab product and minimize
any rework and delay in getting it merged into master.
GitLab team members who apply the ~"Accepting Merge Requests" label to an issue
@@ -226,7 +226,7 @@ code snippet right after your description in a new line: `~"feature proposal"`.
Please keep feature proposals as small and simple as possible, complex ones
might be edited to make them small and simple.
-Please submit Feature Proposals using the ['Feature Proposal' issue template](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab/issue_templates/Feature%20Proposal.md) provided on the issue tracker.
+Please submit Feature Proposals using the ['Feature Proposal' issue template](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab/issue_templates/Feature%20proposal.md) provided on the issue tracker.
For changes in the interface, it is helpful to include a mockup. Issues that add to, or change, the interface should
be given the ~"UX" label. This will allow the UX team to provide input and guidance. You may