summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update_ruby_6_2_stable' of /home/git/repositories/gitlab/gitlab...6-2-stableDmitriy Zaporozhets2013-11-231-2/+2
|\
| * Update ruby to patchlevel 353 (security update)Achilleas Pipinellis2013-11-231-2/+2
|/
* Merge branch 'fix-check' of /home/git/repositories/gitlab/gitlabhq into 6-2-s...Dmitriy Zaporozhets2013-11-211-1/+1
|\
| * Update check as well.Sytse Sijbrandij2013-11-211-1/+1
|/
* Merge branch 'add-new-gitlab-shell' of /home/git/repositories/gitlab/gitlabhq...Dmitriy Zaporozhets2013-11-201-1/+1
|\
| * Install latest version of GitLab Shell, commit in master did not merge cleanly.Sytse Sijbrandij2013-11-201-1/+1
|/
* Merge branch 'api_token_cast' of /home/git/repositories/gitlab/gitlabhq into ...v6.2.4Dmitriy Zaporozhets2013-11-143-3/+8
|\
| * 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 stringDmitriy Zaporozhets2013-11-141-1/+6
|/
* Merge branch 'ldap_block_fix' of /home/git/repositories/gitlab/gitlabhq into ...Dmitriy Zaporozhets2013-11-051-1/+1
|\
| * When looking up a user by DN, use single scopeElias Mårtenson2013-11-041-1/+1
* | Version 6.2.3v6.2.3Dmitriy Zaporozhets2013-11-041-1/+1
|/
* Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitl...Dmitriy Zaporozhets2013-11-041-1/+1
|\
| * Use gitlab-shell 1.7.4Jacob Vosmaer2013-11-011-1/+1
|/
* Require gitlab-shell 1.7.4Dmitriy Zaporozhets2013-11-011-1/+1
* Revert "Escape strings"Dmitriy Zaporozhets2013-11-011-14/+12
* Revert "Best to escape strings not split them"Dmitriy Zaporozhets2013-11-011-14/+14
* Correctly escape search queryDmitriy Zaporozhets2013-11-011-1/+2
* Shell escape code searchDmitriy Zaporozhets2013-11-011-1/+1
* Require gitlab-shell v1.7.3Dmitriy Zaporozhets2013-11-011-1/+1
* Best to escape strings not split themNigel Kukard2013-11-011-14/+14
* Escape stringsNigel Kukard2013-11-011-12/+14
* Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq int...Dmitriy Zaporozhets2013-11-011-2/+4
|\
| * Restore sidekiq rake tasksJacob Vosmaer2013-11-011-2/+4
|/
* Version to 6.2.2v6.2.2Dmitriy Zaporozhets2013-10-311-1/+1
* Update gitlab_git to recent versionDmitriy Zaporozhets2013-10-312-5/+5
* Version 6.2.1v6.2.1Dmitriy Zaporozhets2013-10-281-1/+1
* Fix for issue #5431arul2013-10-251-0/+1
* Merge branch '6-2-stable' of github.com:gitlabhq/gitlabhq into 6-2-stableDmitriy Zaporozhets2013-10-221-2/+2
|\
| * Merge pull request #5389 from alexyoder/patch-1Jacob Vosmaer2013-10-211-2/+2
| |\
| | * change 6-1-stable to 6-2-stableAlex Yoder2013-10-211-2/+2
| |/
* | Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stableDmitriy Zaporozhets2013-10-221-2/+2
|\ \ | |/ |/|
| * Use `2>&1` because Bash 3 does not support `&>>`Jacob Vosmaer2013-10-221-2/+2
|/
* Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhqv6.2.0Dmitriy Zaporozhets2013-10-211-1/+1
|\
| * Skip rdoc to speed up Ruby compilationJacob Vosmaer2013-10-181-1/+1
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-10-210-0/+0
|\ \
| * \ Merge pull request #5380 from thestv/patch-1Jacob Vosmaer2013-10-210-0/+0
| |\ \
| | * | corrected the url of the init-scriptStefan Baust2013-10-201-1/+1
* | | | Version up to 6.2.0Dmitriy Zaporozhets2013-10-211-1/+1
|/ / /
* | | Improve project_merge_requests.rb feature stepsDmitriy Zaporozhets2013-10-211-7/+13
* | | Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-211-6/+6
|\ \ \
| * | | Add smtp settings override in smtp_settings sample file.Marin Jankovski2013-10-181-6/+6
* | | | Merge pull request #5382 from nattster/patch-1Dmitriy Zaporozhets2013-10-201-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use init.d/gitlab script from 6-0-stable branchNatt Piyapramote2013-10-211-1/+1
|/ / /
* | | Fix rspec test after bdd3513f03a1db060051a29ffcf535821235eac1Dmitriy Zaporozhets2013-10-201-1/+1
* | | Merge pull request #5373 from rtripault/milestone-iidDmitriy Zaporozhets2013-10-205-5/+5
|\ \ \
| * | | A few other iids instead of ids (mostly in edit forms)Romain2013-10-194-4/+4
| * | | Show milestones iid instead of idRomain2013-10-191-1/+1
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2013-10-201-2/+2
|\ \ \ \ | | |_|/ | |/| |
View Lorry Controller Status