- 18 Jul, 2016 1 commit
-
-
Rémy Coutable authored
This reverts commit 530f5158. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 13 Jul, 2016 2 commits
-
-
Robert Speicher authored
This reverts commit 9ca633eb, reversing changes made to fb229bbf.
-
Timothy Andrew authored
1. When a merge request is being merged, save the merge commit SHA in the `in_progress_merge_commit_sha` database column. 2. The `pre-receive` hook looks for any locked (in progress) merge request with `in_progress_merge_commit_sha` matching the `newrev` it is passed. 3. If it finds a matching MR, the merge is legitimate. 4. Update `git_access_spec` to test the behaviour we added here. Also refactored this spec a bit to make it easier to add more contexts / conditions.
-