summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5-4-stable' of github.com:gitlabhq/gitlabhq into 5-4-stable5-4-stableJacob Vosmaer2014-01-161-0/+5
|\
| * Merge pull request #4786 from terrywang/issue-4785Dmitriy Zaporozhets2013-12-221-0/+5
| |\
| | * Fix issue 4785 - missing gitlab-shell part in update guideTerry Wang2013-08-151-0/+5
* | | Monkey patch for CVE-2013-6414Jacob Vosmaer2013-12-041-0/+21
|/ /
* | Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq i...v5.4.2Dmitriy Zaporozhets2013-11-143-3/+4
|\ \
| * | Use gitlab-shell 1.7.8Jacob Vosmaer2013-11-141-1/+1
| * | Bump versionJacob Vosmaer2013-11-141-1/+1
| * | Make sure private_token for API is a stringJacob Vosmaer2013-11-141-1/+2
|/ /
* | Merge branch '5-4-security-update' of /home/git/repositories/gitlab/gitlabhq ...v5.4.1Dmitriy Zaporozhets2013-11-048-45/+10
|\ \
| * | Add db:setup to rake gitlab:testDmitriy Zaporozhets2013-11-041-1/+1
| * | Bump version to 5.4.1Jacob Vosmaer2013-11-041-1/+1
| * | Bump gitlab-shell to 1.7.4 (CVE-2013-4490)Jacob Vosmaer2013-11-042-2/+2
| * | Correctly escape search queryDmitriy Zaporozhets2013-11-041-1/+2
| * | Shell escape code searchDmitriy Zaporozhets2013-11-041-1/+1
| * | Update gitlab_git (CVE-2013-4489)Jacob Vosmaer2013-11-042-5/+5
| * | Fix for Resque forking might cause stuck workers for the threaded Sidekiq.Sytse Sijbrandij2013-09-251-36/+0
|/ /
* | Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq int...Dmitriy Zaporozhets2013-08-271-4/+4
|\ \
| * | Updated sidekiq Gemfile.lock for celluloid errorIzaak Alpert2013-08-271-4/+4
|/ /
* | Merge pull request #4801 from Rovanion/patch-3Jacob Vosmaer2013-08-191-1/+1
|\ \ | |/ |/|
| * Don't restart nginx, just tell it to reload it's config files.Rovanion Luckey2013-08-171-1/+1
|/
* Merge pull request #4611 from axilleas/bump-gitlab-shell-version_5-4Dmitriy Zaporozhets2013-08-041-1/+1
|\
| * Bump version of gitlab-shell to 1.5.0 and fix gitlab version typoAxilleas Pipinellis2013-08-031-2/+2
* | Update references to 5-3-stable in install guidev5.4.0Jacob Vosmaer2013-07-221-4/+4
|/
* Update VERSION to 5.4.0Dmitriy Zaporozhets2013-07-191-1/+1
* Merge pull request #4589 from lukas2511/patch-1Dmitriy Zaporozhets2013-07-181-1/+1
|\
| * Update installation.mdLukas Schauer2013-07-181-1/+1
|/
* Doc for update from 5.3 to 5.4Dmitriy Zaporozhets2013-07-181-0/+80
* 5.4.0 is rc1Dmitriy Zaporozhets2013-07-121-1/+1
* Update CHANGELOGDmitriy Zaporozhets2013-07-121-0/+5
* Merge pull request #4324 from axilleas/initd_scriptDmitriy Zaporozhets2013-07-121-3/+5
|\
| * Removal of gitlab.socket should be in stop function too. Fix #4313Axilleas Pipinellis2013-07-121-3/+5
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-07-121-1/+1
|\ \
| * \ Merge pull request #4533 from babatakao/patch-2Yves Senn2013-07-121-1/+1
| |\ \ | | |/ | |/|
| | * Fix typo.Takao Baba2013-07-121-1/+1
| |/
* | Fix issues 500 if milestone id exists but milestone is notDmitriy Zaporozhets2013-07-121-1/+1
|/
* Merge pull request #3993 from bke-drewb/3599Dmitriy Zaporozhets2013-07-113-19/+27
|\
| * Issue 3599: Add snippets_enabled flag to projects for APIDrew Blessing2013-06-113-18/+26
* | Merge pull request #4264 from andrewwutw/fix-postgresql-restoreDmitriy Zaporozhets2013-07-111-1/+1
|\ \
| * | Fix PostgreSQL database restoration problem (#4217)andrewwutw2013-06-101-1/+1
* | | Merge pull request #4282 from bke-drewb/3904Dmitriy Zaporozhets2013-07-111-0/+9
|\ \ \
| * | | Increase snippet content column size.Drew Blessing2013-06-111-0/+9
* | | | Merge pull request #4297 from jdurand/patch-1Dmitriy Zaporozhets2013-07-111-1/+1
|\ \ \ \
| * | | | Update api.js.coffeeJim2013-06-131-1/+1
* | | | | Merge pull request #4353 from dirker/allow-import-via-git-protocolDmitriy Zaporozhets2013-07-111-1/+1
|\ \ \ \ \
| * | | | | project: allow import via git:// urlDirk Hörner2013-06-201-1/+1
* | | | | | Merge pull request #4398 from Razer6/remove_gitolite_checkDmitriy Zaporozhets2013-07-111-2/+0
|\ \ \ \ \ \
| * | | | | | Remove gitolite repo check for import scriptRobert Schilling2013-06-231-2/+0
* | | | | | | Merge pull request #4502 from wuwx/patch-1Dmitriy Zaporozhets2013-07-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix bug when project named: mediawikiwuweixin2013-07-061-1/+1
* | | | | | | | Merge pull request #4528 from akiva/masterDmitriy Zaporozhets2013-07-111-1/+1
|\ \ \ \ \ \ \ \
View Lorry Controller Status