summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-181-2/+2
| |\ \ \
| | * | | Add an example.Marin Jankovski2013-10-181-2/+2
* | | | | Merge pull request #5377 from tsigo/autocomplete_refactorDmitriy Zaporozhets2013-10-204-46/+160
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refactor and cover search_autocomplete_sourceRobert Speicher2013-10-203-45/+142
| * | | | Cover the simple_sanitize helperRobert Speicher2013-10-192-1/+18
|/ / / /
* | | | Merge pull request #5363 from Razer6/logrote_for_update_docsJacob Vosmaer2013-10-181-5/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Add logrotate config to update docsRobert Schilling2013-10-181-5/+16
|/ / /
* | | Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab...Dmitriy Zaporozhets2013-10-185-5/+5
|\ \ \
| * | | Use gitlab_config intead of Gitlab.config.gitlab in viewsDmitriy Zaporozhets2013-10-175-5/+5
|/ / /
* | | Add warning for issue visibility.Sytse Sijbrandij2013-10-171-1/+2
| |/ |/|
* | Merge branch 'fix_sidekiq_process_count' of /home/git/repositories/gitlab/git...Dmitriy Zaporozhets2013-10-171-7/+7
|\ \
| * | Count sidekiq processes using String#scanJacob Vosmaer2013-10-171-7/+7
* | | Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-171-1/+1
|\ \ \ | | |/ | |/|
| * | Update project api doc.Marin Jankovski2013-10-171-1/+1
| |/
* | Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-10-172-3/+45
|\ \ | |/ |/|
| * Make clearer use of the check.Marin Jankovski2013-10-171-6/+10
| * Use more descriptive name for config check.Marin Jankovski2013-10-171-4/+4
| * Fallback to internal issue tracker if config is invalid.Marin Jankovski2013-10-172-3/+41
* | No text shadow for state-labelDmitriy Zaporozhets2013-10-171-0/+1
* | Version up to betaDmitriy Zaporozhets2013-10-171-1/+1
* | Minor UI improvement for ui-box-showDmitriy Zaporozhets2013-10-171-1/+2
* | Add description to issues, projects in development fixturesDmitriy Zaporozhets2013-10-172-2/+5
* | Speed up testsDmitriy Zaporozhets2013-10-172-6/+3
* | Order milestone due date on issues page filterDmitriy Zaporozhets2013-10-171-1/+1
* | Fix GollumWiki::CouldNotCreateWikiError during testsDmitriy Zaporozhets2013-10-171-2/+8
View Lorry Controller Status