summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | fixed admin root path for headerDmitriy Zaporozhets2012-04-201-1/+1
* | Admin dashboardrandx2012-04-205-1/+76
* | Pagination and better perfomance for projects page.randx2012-04-206-19/+42
* | Merge pull request #698 from Sindacious/masterDmitriy Zaporozhets2012-04-201-1/+1
|\ \
| * | display milestones that are not marked with a due date as activeJames Newton2012-04-191-1/+1
* | | Use try for commit prev_commit_id detectionv2.4.0preDmitriy Zaporozhets2012-04-191-2/+2
* | | Fix an issue with MR unavailable if remove source branchDmitriy Zaporozhets2012-04-191-5/+8
|/ /
* | Merge pull request #696 from CodeBlock/patch-1Dmitriy Zaporozhets2012-04-191-3/+3
|\ \
| * | Fix a few grammatical mistakes in profile view.Ricky Elrod2012-04-191-3/+3
|/ /
* | Merge pull request #687 from fixe/label-typoDmitriy Zaporozhets2012-04-171-6/+6
|\ \
| * | Fixed typo in labelTiago Ribeiro2012-04-181-6/+6
* | | Merge pull request #686 from fixe/patch-1Dmitriy Zaporozhets2012-04-171-2/+2
|\ \ \ | |/ / |/| |
| * | Fixed typoTiago Ribeiro2012-04-181-2/+2
|/ /
* | MR commits suppressed if too many. few iconsDmitriy Zaporozhets2012-04-174-5/+29
* | Milestone filter for issues improvedDmitriy Zaporozhets2012-04-171-4/+5
* | fixed app crash on new issue via getDmitriy Zaporozhets2012-04-171-4/+0
* | 1. Improved admin -> new project formDmitriy Zaporozhets2012-04-176-8/+20
* | Issues form improved, Show milestone for Issue showDmitriy Zaporozhets2012-04-174-34/+76
* | User blocking improved. Admin area styledDmitriy Zaporozhets2012-04-1613-109/+231
* | Commit header improved. finalize PR 667Dmitriy Zaporozhets2012-04-166-98/+97
View Lorry Controller Status