summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqv2.4.2Zevs2012-04-301-1/+1
|\
| * small fix installation`s guide.Valeriy Sizov2012-04-291-1/+1
* | Task#755 auto-merge don`t work correctly.Zevs2012-04-301-2/+5
|/
* MR: change path to lock fileValery Sizov2012-04-271-4/+2
* Merge branch 'master' of github.com:gitlabhq/gitlabhqValery Sizov2012-04-270-0/+0
|\
| * Merge pull request #743 from qqshfox/fix_issue_742Dmitriy Zaporozhets2012-04-261-1/+1
| |\
| | * fix #742Hanfei Shen2012-04-261-1/+1
* | | Task #735 Automerge should not be checked on every load of MR show pageValery Sizov2012-04-272-4/+14
* | | Hooks UI improved, Request tests addedDmitriy Zaporozhets2012-04-2610-85/+125
|/ /
* | Merge pull request #741 from mgesmundo/masterDmitriy Zaporozhets2012-04-261-2/+15
|\ \
| * | Cosmetic change in menumgesmundo2012-04-261-2/+15
|/ /
* | Merge pull request #732 from mmozuras/ldap_name_utf8Valeriy Sizov2012-04-241-7/+7
|\ \
| * | Force utf-8 encoding for ldap omniauth_info.namemmozuras2012-04-241-7/+7
* | | Home button should targeted on root page of contextDmitriy Zaporozhets2012-04-247-13/+6
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqgitlabhq2012-04-241-1/+1
|\ \ \
| * \ \ Merge pull request #704 from tader/workaround-charlock-holmesDmitriy Zaporozhets2012-04-241-1/+1
| |\ \ \
| | * | | Rescue from CharlockHolmes failureThomas A. de Ruiter2012-04-241-1/+1
| |/ / /
* | | | New project page improved. User profile improved. Show issues, participant on...gitlabhq2012-04-2420-117/+200
|/ / /
* | | Merge pull request #726 from kvs/patch-1Ariejan de Vroom2012-04-231-2/+2
|\ \ \ | |/ /
| * | Fix very minor spelling issue.Kenneth Vestergaard2012-04-231-2/+2
|/ /
* | fixed email markdownv2.4.1gitlabhq2012-04-236-4/+22
|/
* 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
* Merge pull request #713 from gitlabhq/fast_automergeDmitriy Zaporozhets2012-04-225-11/+67
|\
| * fast automerge: doneValery Sizov2012-04-225-21/+52
| * fast automerge: base implementationValery Sizov2012-04-224-11/+36
* | logo changed for headerDmitriy Zaporozhets2012-04-223-2/+13
|/
* Increased automerge timeout. Works for 300 commits MR on repo with 200MB sizeDmitriy Zaporozhets2012-04-211-14/+18
* Fixed db_schema & reordered rake tasksDmitriy Zaporozhets2012-04-214-12/+16
* Merge remote-tracking branch 'origin/merge_button'Dmitriy Zaporozhets2012-04-2113-7/+223
|\
| * 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: 'already can not be merged' alertValery Sizov2012-04-164-5/+25
| * Auto-merge: checking via AJAXValery Sizov2012-04-166-10/+43
| * fixed mr unmergable methodDmitriy Zaporozhets2012-03-311-1/+1
| * Merge Button v1 completeDmitriy Zaporozhets2012-03-306-25/+31
| * Rake task to provider full repo access for gitolite-owner.\n Automerge requi...randx2012-03-302-0/+38
| * Unverify MR on every push. Ajax for MR accept. better UIrandx2012-03-305-9/+18
| * Better merge handling. show if MR can be accepted or notrandx2012-03-306-58/+83
| * Link for auto merge, db field for MRDmitriy Zaporozhets2012-03-305-25/+61
| * Raw gitlab automerge featurerandx2012-03-293-1/+44
* | VERSION to 2.4.0Dmitriy Zaporozhets2012-04-212-2/+2
* | linguist gitlab forkDmitriy Zaporozhets2012-04-212-11/+11
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-us...Dmitriy Zaporozhets2012-04-211-1/+1
|\ \
| * \ Merge pull request #709 from blueyed/masterDmitriy Zaporozhets2012-04-201-1/+1
| |\ \
| | * | Fix typo: "less then" => "less than".Daniel Hahler2012-04-201-1/+1
* | | | Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreib...Dmitriy Zaporozhets2012-04-217-10/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Switch to Redcarpet for Markdown Rendering.Arthur Schreiber2012-04-207-13/+30
| |/ /
* | | Project linguist integrationDmitriy Zaporozhets2012-04-215-7/+20
* | | Using github's linguist to better detect filetypes and to do syntax highlight...Arthur Schreiber2012-04-206-56/+21
|/ /