diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-07 07:49:39 +0000 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-07 07:49:39 +0000 |
commit | 412ab17d3f2033c6cc602c79be56476d186f124d (patch) | |
tree | 94fcc09563d33dd6a9235405134b6bdc45ceef68 | |
parent | 50f5960c72b4ff8b553bb0f7e8f649ac413f6ce0 (diff) | |
parent | 77e7f512c38183c70ea40a245da80b36bbd82f77 (diff) | |
download | gitlab-ce-412ab17d3f2033c6cc602c79be56476d186f124d.tar.gz |
Merge branch 'stewardship-label' into 'master'
add the stewardship label to contributing.md
See merge request !8997
-rw-r--r-- | CONTRIBUTING.md | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d1f3d3f926..315cd1e598c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,7 @@ - [Issue weight](#issue-weight) - [Regression issues](#regression-issues) - [Technical debt](#technical-debt) + - [Stewardship][#stewardship] - [Merge requests](#merge-requests) - [Merge request guidelines](#merge-request-guidelines) - [Contribution acceptance criteria](#contribution-acceptance-criteria) @@ -230,6 +231,21 @@ for a release by the appropriate person. Make sure to mention the merge request that the `technical debt` issue is associated with in the description of the issue. +### Stewardship + +For issues related to the open source stewardship of GitLab, +there is the ~"stewardship" label. + +This label is to be used for issues in which the stewardship of GitLab +is a topic of discussion. For instance if GitLab Inc. is planning to remove +features from GitLab CE to make exclusive in GitLab EE, related issues +would be labelled with ~"stewardship". + +A recent example of this was the issue for +[bringing the time tracking API to GitLab CE][time-tracking-issue]. + +[time-tracking-issue]: https://gitlab.com/gitlab-org/gitlab-ce/issues/25517#note_20019084 + ## Merge requests We welcome merge requests with fixes and improvements to GitLab code, tests, |