summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '6-8-2' into '6-8-stable'v6.8.26-8-stableDmitriy Zaporozhets2014-05-124-30/+34
|\
| * 6-8-2 releaseJob van der Voort2014-05-124-30/+34
|/
* Bump version to 6.8.1v6.8.1Jacob Vosmaer2014-04-232-1/+4
* Bump the required gitlab-shell version to 1.9.3Jacob Vosmaer2014-04-231-1/+1
* Merge branch '6-8-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-8-...Job van der Voort2014-04-220-0/+0
|\
| * Merge branch 'shell_version_install_doc' into '6-8-stable'Dmitriy Zaporozhets2014-04-221-1/+1
| |\
* | | version 6.8.0v6.8.0Job van der Voort2014-04-221-1/+1
* | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-222-2/+4
|\ \ \
| * \ \ Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via...Sytse Sijbrandij2014-04-221-1/+1
| |\ \ \
| | * | | Allow to overwrite location of gitlab.yml config file.Cyril Rohr2014-04-151-1/+1
| * | | | Merge pull request #6783 from pkgr/allow-secret-token-envSytse Sijbrandij2014-04-221-1/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Allow to specify secret token via environment variable.Cyril Rohr2014-04-151-1/+3
| | |/ /
* | | | Merge branch 'shell_version_install_doc' into 'master'Dmitriy Zaporozhets2014-04-221-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Update installation guide with new shell version.Marin Jankovski2014-04-221-1/+1
| |/ /
* | | Merge branch 'detailed-monthly-release' into 'master'Sytse Sijbrandij2014-04-221-7/+23
|\ \ \ | |/ / |/| |
| * | remove redudant text in release docJob van der Voort2014-04-221-4/+4
| * | add steps to monthly releasesJob van der Voort2014-04-221-5/+21
* | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-223-8/+10
|\ \ \ | |/ / |/| |
| * | Merge pull request #6806 from robertd/fix-typo-in-docsJob van der Voort2014-04-221-2/+2
| |\ \
| | * | Fix minor typo in docsrobertd2014-04-171-2/+2
| * | | Merge pull request #6808 from robertd/upgrade-docs-6.7-6.8Job van der Voort2014-04-221-5/+7
| |\ \ \
| | * | | Update title and revert section of 6.7-to-6.8 docsrobertd2014-04-211-5/+7
| | |/ /
| * | | Merge pull request #6821 from skv-headless/fix_typeSytse Sijbrandij2014-04-181-1/+1
| |\ \ \
| | * | | fix installation.md typeEvgeniy Sokovikov2014-04-181-1/+1
| |/ / /
* | | | Merge branch '512mb' into 'master'Dmitriy Zaporozhets2014-04-221-8/+14
|\ \ \ \
| * | | | Take into account active users.dosire2014-04-211-8/+14
|/ / / /
* | | | Merge branch 'workflow_documentation' into 'master'Sytse Sijbrandij2014-04-182-1/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Remove help document titleJacob Vosmaer2014-04-181-2/+0
| * | | Bring back 'Authorization for Merge Requests'Jacob Vosmaer2014-04-181-0/+34
| * | | Link to the workflow indexJacob Vosmaer2014-04-181-1/+1
|/ / /
* | | Merge branch 'update-monthly-release-doc' into 'master'Dmitriy Zaporozhets2014-04-171-0/+15
|\ \ \
| * | | add dependency check to montly release doc and tweet instructionsJob van der Voort2014-04-171-0/+15
| |/ /
* | | Merge branch 'official-location' into 'master'Dmitriy Zaporozhets2014-04-171-0/+4
|\ \ \ | |/ / |/| |
| * | Prevent questions about the canonical source.dosire2014-04-171-0/+4
|/ /
* | Merge branch 'rc1-updates' into 'master'Dmitriy Zaporozhets2014-04-173-3/+132
|\ \
| * | bump versions in update guideJob van der Voort2014-04-171-2/+2
| * | add 67-68 update guideJob van der Voort2014-04-171-0/+129
| * | update VERSION to 6.8.0.rc1v6.8.0.rc1Job van der Voort2014-04-171-1/+1
| * | update version in installation docJob van der Voort2014-04-171-2/+2
|/ /
* | Merge pull request #6789 from zzjin/patch-1Dmitriy Zaporozhets2014-04-161-2/+2
|\ \
| * | fix bundle install errorzzjin2014-04-161-2/+2
| |/
* | Merge pull request #6784 from jvanbaarsen/remove-unused-sass-extendsDmitriy Zaporozhets2014-04-162-4/+0
|\ \ | |/ |/|
| * Removed missing sass selectorsJeroen van Baarsen2014-04-152-4/+0
|/
* Merge pull request #6780 from cbordei/hotfix/issue-6615Dmitriy Zaporozhets2014-04-151-1/+1
|\
| * Fixed multiple close issue #6615Cristian Bordei2014-04-151-1/+1
* | Merge branch 'restful-naming' into 'master'Dmitriy Zaporozhets2014-04-151-1/+1
|\ \
| * | Endpoints are for RPC interfaces, we have resources.dosire2014-04-151-1/+1
|/ /
* | Merge branch 'routing-for-groups' into 'master'Dmitriy Zaporozhets2014-04-152-0/+13
|\ \
| * | Fixes to group route tests, thanks DZGitLab2014-04-151-2/+1
| * | Add short path route for groups.GitLab2014-04-132-0/+14