summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Skip 'git annex init' when using 'gcryptsetup'no-init-on-gcryptsetupJacob Vosmaer2015-08-112-1/+14
| | | | | 'gcryptsetup' is a special git-annex feature that does its own initialization.
* Merge branch 'version_bump' into 'master' v2.6.4Dmitriy Zaporozhets2015-08-052-1/+2
|\ | | | | | | | | | | | | Version bump 2.6.4 See merge request !17
| * 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
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | 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-place This will speed up the rm-key operation. The downside is that authorized_keys will not shrink when you remove a key. If this ever becomes a problem it can be fixed by running 'rake gitlab:shell:setup'. See merge request !66
| * | Remove keys from authorized_keys in-placeJacob Vosmaer2015-07-163-11/+14
| |/ | | | | | | | | | | This will speed up the rm-key operation. The downside is that authorized_keys will not shrink when you remove a key. If this ever becomes a problem it can be fixed by running 'rake gitlab:shell:setup'.
* | 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 script Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @vsizov See merge request !14
| | * | Add gitlab-ci yml scriptDmitriy Zaporozhets2015-07-011-0/+22
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | 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 omnibus-gitlab. Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab. Added a note so everyone is aware of this. Similar is added to gitlab-ce and gitlab-ci. Discussed in gitlab-org/omnibus-gitlab#605 See merge request !13
| | * Add a note that changing example configuration files requires changing ↵note_in_configMarin Jankovski2015-06-111-0/+5
| |/ | | | | | | omnibus-gitlab.
* | Merge pull request #230 from bozaro/git-lfs-authenticateDmitriy Zaporozhets2015-07-062-3/+45
|\ \ | |/ |/| Add git-lfs-authenticate to command white list
| * 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. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/32. See merge request !11
| * 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
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'list-ecdsa' into 'master'Dmitriy Zaporozhets2015-04-133-2/+5
|\ | | | | | | | | | | | | | | Include ecdsa keys in `gitlab_keys list-keys`. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/31. See merge request !12
| * 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
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Refactor logic around GL_ID. Builds upon !8. See merge request !9
| | * 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 file
| * | Allow to configure location of the secret fileJakub Jirutka2015-02-083-1/+9
| | |
* | | Version 2.6.1v2.6.1Dmitriy Zaporozhets2015-04-092-1/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'nice-error-message' into 'master'Dmitriy Zaporozhets2015-04-095-32/+49
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Write errors to stderr to get git to abort and show them as such. Addresses private issues https://dev.gitlab.org/gitlab/gitlab-shell/issues/33 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2195. ![Screen_Shot_2015-04-06_at_13.05.43](https://gitlab.com/gitlab-org/gitlab-shell/uploads/56a4b9f4cc983da93afeb2b85252ec7e/Screen_Shot_2015-04-06_at_13.05.43.png) See merge request !8
| * | 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. Better alternative to !64 that doesn't require new gems and leaves dealing with string character encoding to gitlab-rails. See gitlab/gitlabhq!1701 for the corresponding changes there. Fixes: - https://github.com/gitlabhq/gitlabhq/issues/7486 - https://gitlab.com/gitlab-org/gitlab-ce/issues/858 - https://gitlab.com/gitlab-org/gitlab-ce/issues/877 - https://gitlab.com/gitlab-org/gitlab-ce/issues/965 See merge request !65
| * | 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 linking
| | * | 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/install It is not clear what we need these for anymore. Because these commands would recurse once through all existing files in all Git repositories, and then another time through all directories these commands could take very long on a server with a lot of repositories. We keep the 'chmod' on config.repos_path, to deny world access to all files and directories beneath it. See merge request !63
| * | Remove recursive commands from bin/installJacob Vosmaer2015-02-262-2/+4
|/ / | | | | | | | | | | | | | | | | | | It is not clear what we need these for anymore. Because these commands would recurse once through all existing files in all Git repositories, and then another time through all directories these commands could take very long on a server with a lot of repositories. We keep the 'chmod' on config.repos_path, to deny world access to all files and directories beneath it.
* | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | Return true from GitlabPostReceive to ensure custom hooks run. Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/438. See merge request !62
| * | Fix testsDmitriy Zaporozhets2015-02-232-11/+11
| | |
| * | Add tests.Douwe Maan2015-02-232-9/+78
| | |
View Lorry Controller Status