summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Be more consistent about default gitlab_urlremove-trailing-slashesJacob Vosmaer2015-12-112-2/+2
* Remove trailing slashes from gitlab_urlJacob Vosmaer2015-12-113-6/+12
* Merge branch 'revert-lfs-authenticate' into 'master' v2.6.8ui-dev-kitDmitriy Zaporozhets2015-11-253-4/+3
|\
| * Bump version to 2.6.8Dmitriy Zaporozhets2015-11-252-2/+2
| * Return changelog item for 2.6.6Dmitriy Zaporozhets2015-11-251-0/+1
| * Revert "Run git-lfs-authenticate script with original command line arguments"Dmitriy Zaporozhets2015-11-252-3/+1
|/
* Bump version to 2.6.7v2.6.7Douwe Maan2015-11-182-1/+3
* Merge branch 'mirror-repository' into 'master' Robert Speicher2015-11-172-10/+43
|\
| * Add changelog entriesmirror-repositoryDouwe Maan2015-11-171-4/+8
| * Add fetch-remote commandDouwe Maan2015-11-111-0/+25
| * Exit with non-zero status when import-repository failsDouwe Maan2015-11-111-6/+10
* | Revert "Merge branch 'use-load-path' into 'master' "Dmitriy Zaporozhets2015-11-126-17/+8
* | Merge branch 'y/httpunix2' into 'master' Dmitriy Zaporozhets2015-11-124-2/+118
|\ \
| * | Add support to connect gitlab-shell to Unicorn via UNIX socketKirill Smelkov2015-11-104-2/+118
| |/
* | Merge branch 'use-load-path' into 'master' Dmitriy Zaporozhets2015-11-126-8/+17
|\ \ | |/ |/|
| * use SHELL_ROOT_PATH variable to set ROOT_PATHPirate Praveen2015-11-101-1/+5
| * use load path instead of require_relativePirate Praveen2015-11-105-7/+12
|/
* Merge branch 'shared-runner' into 'master' Jacob Vosmaer2015-11-101-3/+4
|\
| * Mess with PATHJacob Vosmaer2015-11-101-2/+2
| * Just install everythingJacob Vosmaer2015-11-101-1/+1
| * Add apt-get updateJacob Vosmaer2015-11-101-0/+1
| * Install git-annex (as root) during testsJacob Vosmaer2015-11-101-1/+1
| * Adapt gitlab-ci.yml for shared runnersJacob Vosmaer2015-11-101-1/+1
|/
* Merge branch 'bump_2.6.6' into 'master' v2.6.6Dmitriy Zaporozhets2015-10-222-2/+2
|\
| * Version bump 2.6.6Artem V. Navrotskiy2015-10-212-2/+2
|/
* Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2015-10-211-4/+4
|\
| * Merge pull request #239 from fscherwi/patch-1Jeroen van Baarsen2015-09-291-4/+4
| |\
| | * change images to svg [ci skip]fscherwi2015-09-271-4/+4
| |/
* | Merge branch 'no-init-on-gcryptsetup' into 'master' Dmitriy Zaporozhets2015-10-013-1/+15
|\ \ | |/ |/|
| * Update CHANGELOGJacob Vosmaer2015-10-011-0/+1
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into no-init-on-g...Jacob Vosmaer2015-10-015-5/+68
| |\ | |/ |/|
* | Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate'Dmitriy Zaporozhets2015-09-102-0/+3
|\ \
| * | Run git-lfs-authenticate script with original command line argumentsArtem V. Navrotskiy2015-09-092-0/+5
* | | Merge branch 'bozaro/gitlab-shell-lang'Dmitriy Zaporozhets2015-09-102-0/+4
|\ \ \
| * | | Do not clean LANG environment variable for the git hooks when working through...Artem V. Navrotskiy2015-09-092-0/+4
| |/ /
* | | v2.6.5v2.6.5Robert Speicher2015-09-082-1/+4
* | | Merge branch 'create-hooks-broken-symlink' into 'master'Douwe Maan2015-08-172-4/+57
|\ \ \ | |/ / |/| |
| * | Handle broken symlinks in create-hookscreate-hooks-broken-symlinkJacob Vosmaer2015-08-122-4/+57
|/ /
| * Skip 'git annex init' when using 'gcryptsetup'no-init-on-gcryptsetupJacob Vosmaer2015-08-112-1/+14
|/
* Merge branch 'version_bump' into 'master' v2.6.4Dmitriy Zaporozhets2015-08-052-1/+2
|\
| * Version bump 2.6.4Valery Sizov2015-08-052-1/+2
|/
* Merge branch 'git_annex_env_variable'Dmitriy Zaporozhets2015-08-041-1/+11
|\
| * If git-annex is enabled set GIT_ANNEX_SHELL_LIMITED variable.git_annex_env_variableMarin Jankovski2015-07-161-1/+11
* | Merge branch 'batch-add-keys-timeout'Dmitriy Zaporozhets2015-07-172-1/+3
|\ \
| * | Increase batch_add_keys lock timeout to 300 secondsJacob Vosmaer2015-07-162-1/+3
* | | Merge branch 'faster-rm-key' into 'master' Dmitriy Zaporozhets2015-07-173-11/+14
|\ \ \ | |_|/ |/| |
| * | Remove keys from authorized_keys in-placeJacob Vosmaer2015-07-163-11/+14
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shellMarin Jankovski2015-07-163-3/+30
|\ \
| * \ Merge branch 'yml-script' into 'master'Dmitriy Zaporozhets2015-07-011-0/+22
| |\ \
| | * | Add gitlab-ci yml scriptDmitriy Zaporozhets2015-07-011-0/+22
| |/ /