7 commits

Author	SHA1	Message	Date
Sean McGivern	f680eca912	Don't allow merges with new commits ... Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.	2016-06-01 20:34:41 +01:00
Zeger-Jan van de Weg	0e96d6eb10	Merge branch 'master' into merge-if-green	2015-12-07 10:06:07 +01:00
Rubén Dávila	aa1ba00936	Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583	2015-12-04 10:43:33 -05:00
Zeger-Jan van de Weg	77f8a1e392	Merge when build succeeds	2015-11-02 17:27:38 +01:00
Dmitriy Zaporozhets	3e259ea8bc	Revert "Merge branch 'revert-satellites' into 'master' " ... This reverts commit 5daf44b7c8, reversing changes made to 2f706fbd23.	2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets	9f10943c1a	Revert "Merge branch 'drop-satellites'" ... This reverts commit 957e849f41, reversing changes made to 6b9dbe9f5a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets	a7fded9b95	Huge refactoring for accepting merge requests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-16 16:03:07 +02:00

Renamed from app/views/projects/merge_requests/automerge.js.haml (Browse further)