summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allows username only updates to ldap propertiesIzaak Alpert2013-09-222-1/+108
* Merge pull request #5136 from f0k/patch-1Dmitriy Zaporozhets2013-09-221-0/+1
|\
| * remove old assets before compilingJan Schlüter2013-09-191-0/+1
* | Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projectsDmitriy Zaporozhets2013-09-224-32/+60
|\ \
| * | Prevent empty public projects from throwing exceptionsIzaak Alpert2013-09-204-32/+60
| |/
* | Merge pull request #5116 from karlhungus/feature-configurable-themeDmitriy Zaporozhets2013-09-224-10/+22
|\ \
| * | Defaulted theme to MARSIzaak Alpert2013-09-222-2/+2
| * | Make users theme configurableIzaak Alpert2013-09-224-10/+22
* | | Merge pull request #5145 from hiroponz/fix-api-merge-requestDmitriy Zaporozhets2013-09-222-27/+27
|\ \ \
| * | | Fix API::MergeRequestHiroyuki Sato2013-09-222-27/+27
| |/ /
* | | Corrects the update document to match the version of gitshell specified in th...Spencer Owen2013-09-221-1/+1
* | | Merge branch '6-1-stable'Marin Jankovski2013-09-221-1/+1
|\ \ \
| * | | Version 6.1.0v6.1.0Marin Jankovski2013-09-221-1/+1
* | | | Fix hover for tree viewDmitriy Zaporozhets2013-09-221-2/+2
| |/ / |/| |
* | | Restyle event titleSytse Sijbrandij2013-09-211-2/+2
* | | Restyle tree table UISytse Sijbrandij2013-09-212-3/+7
|/ /
* | 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
* | | Merge pull request #5072 from jbornschein/proj-new-publicDmitriy Zaporozhets2013-09-143-8/+14
|\ \ \
| * | | Use ruby 1.9 hash syntaxJoerg Bornschein2013-09-141-1/+1
| * | | Add public-project? checkbox to new-project viewJoerg Bornschein2013-09-132-7/+13
| * | | Merge branch 'fix-default-opts' into proj-new-publicJoerg Bornschein2013-09-131-1/+1
| |\ \ \
| | * | | Fix default settings when creating new ProjectJoerg Bornschein2013-09-131-1/+1
| |/ / /