summaryrefslogtreecommitdiff
path: root/lib/gitlab_merge.rb
Commit message (Expand)AuthorAgeFilesLines
* lib/ refactoring. Module Gitlabhq renamed to Gitlabrandx2012-05-261-58/+0
* Task#755 auto-merge don`t work correctly.Zevs2012-04-301-2/+5
* MR: change path to lock fileValery Sizov2012-04-271-4/+2
* Make sure tmp/merge_repo is available to write lock files for auto-merge.Ariejan de Vroom2012-04-231-2/+6
* corrected exception for automergev2.4.0Dmitriy Zaporozhets2012-04-221-1/+1
* fast automerge: doneValery Sizov2012-04-221-2/+5
* fast automerge: base implementationValery Sizov2012-04-221-11/+9
* Increased automerge timeout. Works for 300 commits MR on repo with 200MB sizeDmitriy Zaporozhets2012-04-211-14/+18
* Auto-merge: reise exception when gitlab do not have access to repoValery Sizov2012-04-161-1/+3
* Auto-merge: implemented lock fileValery Sizov2012-04-161-8/+13
* Auto-merge: checking via AJAXValery Sizov2012-04-161-0/+1
* Merge Button v1 completeDmitriy Zaporozhets2012-03-301-3/+6
* Better merge handling. show if MR can be accepted or notrandx2012-03-301-8/+19
* Raw gitlab automerge featurerandx2012-03-291-0/+26