summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update_ruby_6_1_stable' of /home/git/repositories/gitlab/gitlab...6-1-stableDmitriy Zaporozhets2013-11-231-3/+3
|\
| * Update ruby to patchlevel 353 (security update)Achilleas Pipinellis2013-11-231-3/+3
|/
* Merge branch '6-1-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-1-stableDmitriy Zaporozhets2013-10-211-3/+15
|\
| * Merge branch 'sidekiq_start_fix' of /home/git/repositories/gitlab/gitlabhq in...Dmitriy Zaporozhets2013-10-211-3/+15
| |\
| | * Use built-in sidekiq deamonizationJacob Vosmaer2013-10-181-1/+1
| | * Remove duplicate log path generationJacob Vosmaer2013-10-181-2/+6
| | * Always shut down sidekiq before startingJacob Vosmaer2013-10-181-1/+9
| |/
* | Merge pull request #5242 from earlonrails/patch-2Jacob Vosmaer2013-10-021-1/+1
|\ \ | |/ |/|
| * Update gitlabKevin Krauss2013-10-011-1/+1
|/
* Merge pull request #5174 from johannesbecker/service-pivotaltrackerDmitriy Zaporozhets2013-09-254-1/+81
|\
| * Syntax cleanupJohannes Becker2013-09-251-12/+16
| * Added spinach Tests for pivotaltracker serviceJohannes Becker2013-09-252-0/+20
| * Remove not needed attr_accessibleJohannes Becker2013-09-251-2/+0
| * Simple PivotalTracker Source Commits ServiceJohannes Becker2013-09-252-1/+59
|/
* Merge pull request #5163 from hiroponz/update-check-script-in-stable-branchDmitriy Zaporozhets2013-09-241-1/+28
|\
| * Update check scriptHiroyuki Sato2013-09-241-1/+28
|/
* Merge pull request #5149 from hiroponz/fix-api-merge-requestDmitriy Zaporozhets2013-09-222-27/+27
|\
| * Fix API::MergeRequestHiroyuki Sato2013-09-222-27/+27
|/
* Merge pull request #5109 from spudstud/6-1-stableDmitriy Zaporozhets2013-09-221-1/+1
|\
| * Corrects the update document to match the version of gitshell specified in th...Spencer Owen2013-09-161-1/+1
* | Version 6.1.0v6.1.0Marin Jankovski2013-09-221-1/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2013-09-211-1/+1
|\ \
| * \ Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhqDmitriy Zaporozhets2013-09-211-1/+1
| |\ \
| | * | Add author of new init scriptAxilleas Pipinellis2013-09-191-1/+1
| |/ /
* | | Update gitlab_git to version 2.3.1Sytse Sijbrandij2013-09-212-4/+4
|/ /
* | README improved. Removed travis badgeSytse Sijbrandij2013-09-191-6/+3
* | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqDmitriy Zaporozhets2013-09-181-2/+4
|\ \
| * \ Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-09-181-2/+4
| |\ \
| | * | Add author and issue id warning.Sytse Sijbrandij2013-09-181-2/+4
| |/ /
* | | Merge pull request #5099 from yatishmehta27/gitignore-changesDmitriy Zaporozhets2013-09-181-0/+2
|\ \ \ | |/ / |/| |
| * | Added .ruby-version & .ruby-gemset in .gitignoreYatish Mehta2013-09-161-0/+2
| |/
* | Merge pull request #5112 from hiroponz/drop-support-of-root-namespaceDmitriy Zaporozhets2013-09-178-26/+19
|\ \
| * | Drop support of root namespace in modelHiroyuki Sato2013-09-178-26/+19
* | | Merge pull request #5117 from karlhungus/feature-password-update-skipped-when...Dmitriy Zaporozhets2013-09-174-1/+40
|\ \ \ | |_|/ |/| |
| * | Don't show users password change page if ldap usersIzaak Alpert2013-09-174-1/+40
|/ /
* | Update docs to use 6-1-stable branchDmitriy Zaporozhets2013-09-161-2/+2
* | Update gitlab_git to version 2.2.0. Fixes invalid diff in CompareDmitriy Zaporozhets2013-09-163-4/+4
|/
* Merge pull request #5093 from smashwilson/example-config-fixDmitriy Zaporozhets2013-09-151-1/+1
|\
| * Don't quote the default issue closing regex.Ash Wilson2013-09-151-1/+1
|/
* Fix testsDmitriy Zaporozhets2013-09-142-8/+14
* Fix 500 error on admin->project pageDmitriy Zaporozhets2013-09-142-4/+3
* Extend user infiormation displayed on admin user pageDmitriy Zaporozhets2013-09-141-1/+8
* Fix setting default values for userDmitriy Zaporozhets2013-09-141-7/+10
* Let it be 6.1.0.rc1Dmitriy Zaporozhets2013-09-141-1/+1
* Update CHANGELOG with new entries for 6.1Dmitriy Zaporozhets2013-09-141-0/+4
* Merge pull request #5084 from spudstud/patch-2Dmitriy Zaporozhets2013-09-141-1/+1
|\
| * Update unicorn.rb.exampleSpencer2013-09-131-1/+1
* | Merge pull request #4996 from hiroponz/drop-support-of-root-namespaceDmitriy Zaporozhets2013-09-1418-150/+133
|\ \
| * | Improve timing problem in spinach testHiroyuki Sato2013-09-131-1/+4
| * | Drop support of root namespace in routingHiroyuki Sato2013-09-1317-149/+129