summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| |/ /
| * | Make link to CI httpsSytse Sijbrandij2015-06-151-2/+2
| * | Merge branch 'note_in_config' into 'master'Dmitriy Zaporozhets2015-06-111-0/+5
| |\ \ | | |/ | |/|
| | * Add a note that changing example configuration files requires changing omnibu...note_in_configMarin Jankovski2015-06-111-0/+5
| |/
* | Merge pull request #230 from bozaro/git-lfs-authenticateDmitriy Zaporozhets2015-07-062-3/+45
|\ \ | |/ |/|
| * Add Git LFS remark to README.mdArtem V. Navrotskiy2015-07-031-0/+29
| * Add git-lfs-authenticate to command white listArtem V. Navrotskiy2015-06-291-3/+16
|/
* Merge branch 'safe-rm-key' into 'master'v2.6.3Dmitriy Zaporozhets2015-04-143-3/+10
|\
| * Prevent keys with a very specific comment from accidentally being deleted.Douwe Maan2015-04-143-3/+10
|/
* Add changelog entry about GL_IDv2.6.2Dmitriy Zaporozhets2015-04-131-0/+1
* Merge branch 'list-ecdsa' into 'master'Dmitriy Zaporozhets2015-04-133-2/+5
|\
| * Include ecdsa keys in `gitlab_keys list-keys`.list-ecdsaDouwe Maan2015-04-103-2/+5
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shellDmitriy Zaporozhets2015-04-137-58/+47
|\ \
| * \ Merge branch 'gl-id-refactor' into 'master'Dmitriy Zaporozhets2015-04-137-58/+47
| |\ \ | | |/ | |/|
| | * Update GitlabShell tests.gl-id-refactorDouwe Maan2015-04-061-25/+22
| | * Refactor GitlabShell#exec a bit.Douwe Maan2015-04-061-7/+9
| | * GitlabShell doesn't need to set GL_ID at all.Douwe Maan2015-04-062-6/+8
| | * Move setting/unsetting of GL_ID from lib to executables.Douwe Maan2015-04-064-20/+8
* | | Merge pull request #212 from jirutka/patch-1Dmitriy Zaporozhets2015-04-103-1/+9
|\ \ \ | |/ / |/| |
| * | Allow to configure location of the secret fileJakub Jirutka2015-02-083-1/+9
* | | Version 2.6.1v2.6.1Dmitriy Zaporozhets2015-04-092-1/+4
* | | Merge branch 'nice-error-message' into 'master'Dmitriy Zaporozhets2015-04-095-32/+49
|\ \ \ | | |/ | |/|
| * | Write GitlabShell error to stderr.nice-error-messageDouwe Maan2015-04-063-21/+36
| * | Write GitlabAccess error to stderr.Douwe Maan2015-04-062-11/+13
|/ /