summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '6-3-1-stable' of /home/git/repositories/gitlab/gitlabhq into 6-...v6.3.16-3-stableDmitriy Zaporozhets2013-12-053-29/+29
|\
| * Bump version to 6.3.1Jacob Vosmaer2013-12-041-1/+1
| * Update rails to 3.2.16Dmitriy Zaporozhets2013-12-042-28/+28
|/
* Merge pull request #5702 from Wachiwi/patch-1Dmitriy Zaporozhets2013-11-271-2/+2
|\
| * Corrected TypoWachiwi2013-11-271-2/+2
|/
* minor fix to commandSairam Kunala2013-11-231-1/+2
* Merge branch 'update_ruby_6_3_stable' of /home/git/repositories/gitlab/gitlab...Dmitriy Zaporozhets2013-11-231-2/+2
|\
| * Update ruby to patchlevel 353 (security update)Achilleas Pipinellis2013-11-231-2/+2
|/
* Fix 6.3 branch nameDmitriy Zaporozhets2013-11-221-5/+5
* Version to 6.3.0v6.3.0Dmitriy Zaporozhets2013-11-221-1/+1
* Improve refs parsing for git over httpDmitriy Zaporozhets2013-11-221-1/+1
* Cleanup parsed refs for git over HTTPDmitriy Zaporozhets2013-11-221-1/+9
* Merge pull request #5647 from lordjabez/developDmitriy Zaporozhets2013-11-211-2/+2
|\
| * Fix grammar in fork error message.Judson D Neer2013-11-211-2/+2
|/
* Merge branch 'os-requirements' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-211-18/+23
|\
| * Ensure customers know that GitLab.com supports RHEL.Sytse Sijbrandij2013-11-211-18/+23
* | Merge branch 'tests_limitation_skip' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-211-2/+5
|\ \ | |/ |/|
| * No limits when testing.Marin Jankovski2013-11-211-2/+5
|/
* Time for release candidateDmitriy Zaporozhets2013-11-211-1/+1
* Style resend confirmation instructionsDmitriy Zaporozhets2013-11-212-12/+8
* Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-214-15/+21
|\
| * Remove duplication in Backup::ManagerJacob Vosmaer2013-11-061-2/+4
| * Remove Bourne shell from backup codeJacob Vosmaer2013-11-064-15/+19
* | Fix testsDmitriy Zaporozhets2013-11-201-1/+2
* | Render markdown in snippetsDmitriy Zaporozhets2013-11-201-4/+13
* | Nicer icons for enabled/disabled stuffDmitriy Zaporozhets2013-11-205-15/+7
* | Add more info to admin dashboardDmitriy Zaporozhets2013-11-206-12/+72
* | Update docs for 6.3Dmitriy Zaporozhets2013-11-201-0/+117
* | Recommend gitlab-shell 1.7.9 in docs and check taskDmitriy Zaporozhets2013-11-2010-10/+10
* | Prefer user email match when looking for commit authorDmitriy Zaporozhets2013-11-201-1/+3
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-11-201-1/+1
|\ \
| * \ Merge pull request #5621 from archiloque/typo_in_gitlab.ymlJacob Vosmaer2013-11-201-1/+1
| |\ \
| | * | Typo in gitlab.yml.exampleJulien Kirch2013-11-191-1/+1
* | | | Correctly remove and re-create satellites when project transferDmitriy Zaporozhets2013-11-201-2/+6
* | | | Parse all refs when do push via HTTP and check permissions for all of themDmitriy Zaporozhets2013-11-201-10/+14
|/ / /
* | | Improve files API. Relative path check added. Create dir for new file if missingDmitriy Zaporozhets2013-11-204-3/+25
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-11-201-1/+1
|\ \ \
| * \ \ Merge pull request #5619 from taziyah/patch-1Jacob Vosmaer2013-11-191-1/+1
| |\ \ \
| | * | | Update 6.0-to-6.2.mdTobias Millauer2013-11-181-1/+1
* | | | | Improve consistency: use file_path for API create/update/delete filesDmitriy Zaporozhets2013-11-206-18/+18
|/ / / /
* | | | Merge branch 'full-post-to-oss-security' of /home/git/repositories/gitlab/git...Dmitriy Zaporozhets2013-11-191-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into full-post-to-oss-securitySytse Sijbrandij2013-11-1925-29/+344
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Changelog entries and version up to beta1Dmitriy Zaporozhets2013-11-192-2/+5
* | | | | Merge branch 'feature/api_delete_file' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-193-3/+77
|\ \ \ \ \
| * | | | | Tests for delete file by APIDmitriy Zaporozhets2013-11-191-0/+34
| * | | | | API: delete file from repositoryDmitriy Zaporozhets2013-11-192-3/+43
* | | | | | Merge branch 'feature/delete_file' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-1911-12/+140
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Remove file from repository featureDmitriy Zaporozhets2013-11-195-4/+51
| * | | | DeleteFile contextDmitriy Zaporozhets2013-11-191-0/+38
| * | | | Fix DeleteFile satellite actionDmitriy Zaporozhets2013-11-191-1/+1