13 Commits

Include renames

Author	SHA1	Message	Date
Zevs	c937d06c3c	Task#755 auto-merge don`t work correctly.	2012-04-30 00:23:19 +03:00
Valery Sizov	903f9491ba	MR: change path to lock file	2012-04-27 01:09:23 +03:00
Ariejan de Vroom	21f3da2358	Make sure tmp/merge_repo is available to write lock files for auto-merge.	2012-04-23 10:54:19 +03:00
Dmitriy Zaporozhets	204c66461e	corrected exception for automerge	2012-04-22 16:49:45 +03:00
Valery Sizov	e5f8397fd4	fast automerge: done	2012-04-22 16:14:01 +03:00
Valery Sizov	dcbb875c46	fast automerge: base implementation	2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets	ae565d24ee	Increased automerge timeout. Works for 300 commits MR on repo with 200MB size	2012-04-21 13:23:44 +03:00
Valery Sizov	3a6694b551	Auto-merge: reise exception when gitlab do not have access to repo	2012-04-16 23:49:57 +03:00
Valery Sizov	5abbada41e	Auto-merge: implemented lock file	2012-04-16 23:37:04 +03:00
Valery Sizov	8269a3a735	Auto-merge: checking via AJAX	2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets	90748cf724	Merge Button v1 complete	2012-03-30 20:49:34 +03:00
randx	411d84f385	Better merge handling. show if MR can be accepted or not	2012-03-30 08:05:04 +03:00
randx	78d620b3b6	Raw gitlab automerge feature	2012-03-29 18:03:05 +03:00