Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cecf7328
Commit
cecf7328
authored
Mar 15, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the MR guidelines from the CONTRIBUTING guide
[ci skip] Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
3735266d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
CONTRIBUTING.md
CONTRIBUTING.md
+9
-7
No files found.
CONTRIBUTING.md
View file @
cecf7328
...
...
@@ -307,9 +307,12 @@ request is as follows:
organized commits by
[
squashing them
][
git-squash
]
1.
Push the commit(s) to your fork
1.
Submit a merge request (MR) to the
`master`
branch
1.
Leave the approvals settings as they are:
1.
Your merge request needs at least 1 approval
1.
You don't have to select any approvers
1.
Your merge request needs at least 1 approval but feel free to require more.
For instance if you're touching backend and frontend code, it's a good idea
to require 2 approvals: 1 from a backend maintainer and 1 from a frontend
maintainer
1.
You don't have to select any approvers, but you can if you really want
specific people to approve your merge request
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.
...
...
@@ -369,7 +372,7 @@ There are a few rules to get your merge request accepted:
1.
If your merge request includes only frontend changes [^1], it must be
**approved by a [frontend maintainer][team]**
.
1.
If your merge request includes frontend and backend changes [^1], it must
be
approved by a frontend
**and**
a backend maintainer
.
be
**approved by a [frontend and a backend maintainer][team]**
.
1.
To lower the amount of merge requests maintainers need to review, you can
ask or assign any
[
reviewers
][
team
]
for a first review.
1.
If you need some guidance (e.g. it's your first merge request), feel free
...
...
@@ -549,6 +552,5 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
[
GitLab Inc engineering workflow
]:
https://about.gitlab.com/handbook/engineering/workflow/#labelling-issues
[
polling-etag
]:
https://docs.gitlab.com/ce/development/polling.html
[
^1
]:
Specs
other than JavaScript specs are considered backend code. Haml
changes are considered backend code if they include Ruby code other than just
pure HTML.
[
^1
]:
Please
note that specs other than JavaScript specs are considered backend
code.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment