summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-15 17:06:11 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-15 17:06:11 +0200
commitf8ea016486de71e112a973b7c42ab20fc8e3b88a (patch)
tree4774d151535f6ae061d09fbf5b0b5b292181b413
parent14ab0228a889980df2e4ce58815b1fff6d916dc1 (diff)
parentd37bdd0ccd4b7a425a466e62e52540c80a223f6b (diff)
downloadgitlab-ce-f8ea016486de71e112a973b7c42ab20fc8e3b88a.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--PROCESS.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 1dd28d6b670..5cc25de05a4 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -104,3 +104,10 @@ This merge request has been closed because a request for more information has no
### Accepting merge requests
Is there a request on [the feature request forum](http://feedback.gitlab.com/forums/176466-general) that is similar to this? If so, can you make a comment with a link to it? Please be aware that new functionality that is not marked [accepting merge/pull requests](http://feedback.gitlab.com/forums/176466-general/status/796455) on the forum might not make it into GitLab. You might be asked to make changes and even after implementing them your feature might still be declined. If you want to reduce the chance of this happening please have a discussion in the forum first.
+
+### Only accepting merge requests with green tests
+
+We can only accept a merge request if all the tests are green. I've just
+restarted the build. When the tests are still not passing after this restart and
+you're sure that is does not have anything to do with your code changes, please
+rebase with master to see if that solves the issue.