summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a note that changing example configuration files requires changing omnibu...note_in_configMarin Jankovski2015-06-111-0/+5
* 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
|/ /
* | Change 2.5.5 to 2.6.0 because of incompatible changesv2.6.0Dmitriy Zaporozhets2015-03-162-2/+2
* | Merge branch 'post-receive-base64' into 'master'Dmitriy Zaporozhets2015-03-164-5/+14
|\ \
| * | Prevent character encoding issues by sending received changes as raw data.Douwe Maan2015-03-154-5/+14
|/ /
* | Stub repo path for testsDmitriy Zaporozhets2015-03-041-0/+1
* | Fix post-receive broadcast messageDmitriy Zaporozhets2015-03-041-1/+1
* | Enable rubocop ruleDmitriy Zaporozhets2015-03-023-4/+4
* | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2015-03-021-1/+1
|\ \
| * \ Merge pull request #214 from p8/masterRobert Schilling2015-02-271-1/+1
| |\ \
| | * | Correct spelling: Symlinking is short for symbolic linkingPetrik de Heus2015-02-271-1/+1
| |/ /
* | | Merge branch 'no-recursive-install' into 'master'Valery Sizov2015-02-262-2/+4
|\ \ \ | |/ / |/| |
| * | Remove recursive commands from bin/installJacob Vosmaer2015-02-262-2/+4
|/ /
* | gitlab-shell version 2.5.4.v2.5.4Marin Jankovski2015-02-231-1/+1
* | Merge branch 'fix-post-receive' into 'master'Marin Jankovski2015-02-244-19/+90
|\ \
| * | Fix testsDmitriy Zaporozhets2015-02-232-11/+11
| * | Add tests.Douwe Maan2015-02-232-9/+78
| * | Return true from GitlabPostReceive to ensure custom hooks run.Douwe Maan2015-02-231-1/+3
|/ /
* | Merge branch 'better-readme' into 'master'Dmitriy Zaporozhets2015-02-211-5/+58
|\ \
| * | Make key authorization easier to understand.Sytse Sijbrandij2015-02-211-3/+2
| * | Better title and description.Sytse Sijbrandij2015-02-211-1/+3
| * | Update readme after Saturday morning conversation with Dmitriy.Sytse Sijbrandij2015-02-211-5/+57
|/ /
* | Add note about centos for git-annex.Marin Jankovski2015-02-201-0/+1
* | Add a comment about gitlab-shell.Marin Jankovski2015-02-201-0/+2
* | Merge branch 'less_if_nesting' into 'master'Dmitriy Zaporozhets2015-02-201-34/+28
|\ \
| * | Fail early on invalid input (raise ... unless ...)Jacob Vosmaer2015-02-201-34/+28
|/ /
* | Bump versionv2.5.3Dmitriy Zaporozhets2015-02-192-1/+4
* | Immediatly raise exception if git-annex is disabledDmitriy Zaporozhets2015-02-191-17/+25
* | Safer line sub for git-annex commandv2.5.2Dmitriy Zaporozhets2015-02-183-2/+5
* | Improve broadcast message logicv2.5.1Dmitriy Zaporozhets2015-02-186-13/+14
* | Bump versionv2.5.0Dmitriy Zaporozhets2015-02-161-1/+1
* | Merge branch 'git-annex-fix' into 'master'Dmitriy Zaporozhets2015-02-171-2/+2
|\ \
| * | Fix syntax of git init commandDmitriy Zaporozhets2015-02-171-1/+1
| * | Fix git-annex init repoDmitriy Zaporozhets2015-02-171-3/+3
|/ /