| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'bump_2.6.6' into 'master' v2.6.6 | Dmitriy Zaporozhets | 2015-10-22 | 2 | -2/+2 | |
| |\ \ | |/ |/| | | | | | | | | | Version bump 2.6.6 See merge request !22 | |||||
| | * | Version bump 2.6.6 | Artem V. Navrotskiy | 2015-10-21 | 2 | -2/+2 | |
| |/ | ||||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlab-shell | Dmitriy Zaporozhets | 2015-10-21 | 1 | -4/+4 | |
| |\ | ||||||
| | * | Merge pull request #239 from fscherwi/patch-1 | Jeroen van Baarsen | 2015-09-29 | 1 | -4/+4 | |
| | |\ | | | | | | | change images to svg | |||||
| | | * | change images to svg [ci skip] | fscherwi | 2015-09-27 | 1 | -4/+4 | |
| | |/ | ||||||
| * | | Merge branch 'no-init-on-gcryptsetup' into 'master' | Dmitriy Zaporozhets | 2015-10-01 | 3 | -1/+15 | |
| |\ \ | |/ |/| | | | | | | | | | | | Skip 'git annex init' when using 'gcryptsetup' 'gcryptsetup' is a special git-annex feature that does its own initialization. See merge request !18 | |||||
| | * | Update CHANGELOG | Jacob Vosmaer | 2015-10-01 | 1 | -0/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into ↵ | Jacob Vosmaer | 2015-10-01 | 5 | -5/+68 | |
| | |\ | |/ |/| | | | no-init-on-gcryptsetup | |||||
| * | | Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate' | Dmitriy Zaporozhets | 2015-09-10 | 2 | -0/+3 | |
| |\ \ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Run git-lfs-authenticate script with original command line arguments | Artem V. Navrotskiy | 2015-09-09 | 2 | -0/+5 | |
| | | | | ||||||
| * | | | Merge branch 'bozaro/gitlab-shell-lang' | Dmitriy Zaporozhets | 2015-09-10 | 2 | -0/+4 | |
| |\ \ \ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | | Do not clean LANG environment variable for the git hooks when working ↵ | Artem V. Navrotskiy | 2015-09-09 | 2 | -0/+4 | |
| | |/ / | | | | | | | | | | | | | | | | through the SSH-protocol When cleaning this environment variable can be problems with the processing of non-ASCII data | |||||
| * | | | v2.6.5v2.6.5 | Robert Speicher | 2015-09-08 | 2 | -1/+4 | |
| | | | | ||||||
| * | | | Merge branch 'create-hooks-broken-symlink' into 'master' | Douwe Maan | 2015-08-17 | 2 | -4/+57 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle broken symlinks in create-hooks If a repository contained a broken symlink named 'hooks', this would raise ENOENT in lib/gitlab_projects.rb, which got ignored in bin/create-hooks. This commit fixes that by making sure we handle broken symlinks in lib/gitlab_projects.rb. See merge request !19 | |||||
| | * | | Handle broken symlinks in create-hookscreate-hooks-broken-symlink | Jacob Vosmaer | 2015-08-12 | 2 | -4/+57 | |
| |/ / | | | | | | | | | | | | | If a repository contained a broken symlink named 'hooks', this would raise ENOENT in lib/gitlab_projects.rb, which got ignored in bin/create-hooks. This commit fixes that by making sure we handle broken symlinks in lib/gitlab_projects.rb. | |||||
| | * | Skip 'git annex init' when using 'gcryptsetup'no-init-on-gcryptsetup | Jacob Vosmaer | 2015-08-11 | 2 | -1/+14 | |
| |/ | | | | | 'gcryptsetup' is a special git-annex feature that does its own initialization. | |||||
| * | Merge branch 'version_bump' into 'master' v2.6.4 | Dmitriy Zaporozhets | 2015-08-05 | 2 | -1/+2 | |
| |\ | | | | | | | | | | | | | Version bump 2.6.4 See merge request !17 | |||||
| | * | Version bump 2.6.4 | Valery Sizov | 2015-08-05 | 2 | -1/+2 | |
| |/ | ||||||
| * | Merge branch 'git_annex_env_variable' | Dmitriy Zaporozhets | 2015-08-04 | 1 | -1/+11 | |
| |\ | ||||||
| | * | If git-annex is enabled set GIT_ANNEX_SHELL_LIMITED variable.git_annex_env_variable | Marin Jankovski | 2015-07-16 | 1 | -1/+11 | |
| | | | ||||||
| * | | Merge branch 'batch-add-keys-timeout' | Dmitriy Zaporozhets | 2015-07-17 | 2 | -1/+3 | |
| |\ \ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Increase batch_add_keys lock timeout to 300 seconds | Jacob Vosmaer | 2015-07-16 | 2 | -1/+3 | |
| | | | | ||||||
| * | | | Merge branch 'faster-rm-key' into 'master' | Dmitriy Zaporozhets | 2015-07-17 | 3 | -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-place | Jacob Vosmaer | 2015-07-16 | 3 | -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-shell | Marin Jankovski | 2015-07-16 | 3 | -3/+30 | |
| |\ \ | ||||||
| | * \ | Merge branch 'yml-script' into 'master' | Dmitriy Zaporozhets | 2015-07-01 | 1 | -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 script | Dmitriy Zaporozhets | 2015-07-01 | 1 | -0/+22 | |
| | |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Make link to CI https | Sytse Sijbrandij | 2015-06-15 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Merge branch 'note_in_config' into 'master' | Dmitriy Zaporozhets | 2015-06-11 | 1 | -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_config | Marin Jankovski | 2015-06-11 | 1 | -0/+5 | |
| | |/ | | | | | | | omnibus-gitlab. | |||||
| * | | Merge pull request #230 from bozaro/git-lfs-authenticate | Dmitriy Zaporozhets | 2015-07-06 | 2 | -3/+45 | |
| |\ \ | |/ |/| | Add git-lfs-authenticate to command white list | |||||
| | * | Add Git LFS remark to README.md | Artem V. Navrotskiy | 2015-07-03 | 1 | -0/+29 | |
| | | | ||||||
| | * | Add git-lfs-authenticate to command white list | Artem V. Navrotskiy | 2015-06-29 | 1 | -3/+16 | |
| |/ | ||||||
| * | Merge branch 'safe-rm-key' into 'master'v2.6.3 | Dmitriy Zaporozhets | 2015-04-14 | 3 | -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 Maan | 2015-04-14 | 3 | -3/+10 | |
| |/ | ||||||
| * | Add changelog entry about GL_IDv2.6.2 | Dmitriy Zaporozhets | 2015-04-13 | 1 | -0/+1 | |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'list-ecdsa' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -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-ecdsa | Douwe Maan | 2015-04-10 | 3 | -2/+5 | |
| | | | ||||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell | Dmitriy Zaporozhets | 2015-04-13 | 7 | -58/+47 | |
| |\ \ | ||||||
| | * \ | Merge branch 'gl-id-refactor' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 7 | -58/+47 | |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | Refactor logic around GL_ID. Builds upon !8. See merge request !9 | |||||
| | | * | Update GitlabShell tests.gl-id-refactor | Douwe Maan | 2015-04-06 | 1 | -25/+22 | |
| | | | | ||||||
| | | * | Refactor GitlabShell#exec a bit. | Douwe Maan | 2015-04-06 | 1 | -7/+9 | |
| | | | | ||||||
| | | * | GitlabShell doesn't need to set GL_ID at all. | Douwe Maan | 2015-04-06 | 2 | -6/+8 | |
| | | | | ||||||
| | | * | Move setting/unsetting of GL_ID from lib to executables. | Douwe Maan | 2015-04-06 | 4 | -20/+8 | |
| | | | | ||||||
| * | | | Merge pull request #212 from jirutka/patch-1 | Dmitriy Zaporozhets | 2015-04-10 | 3 | -1/+9 | |
| |\ \ \ | |/ / |/| | | Allow to configure location of the secret file | |||||
| | * | | Allow to configure location of the secret file | Jakub Jirutka | 2015-02-08 | 3 | -1/+9 | |
| | | | | ||||||
| * | | | Version 2.6.1v2.6.1 | Dmitriy Zaporozhets | 2015-04-09 | 2 | -1/+4 | |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | Merge branch 'nice-error-message' into 'master' | Dmitriy Zaporozhets | 2015-04-09 | 5 | -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.  See merge request !8 | |||||
| | * | | Write GitlabShell error to stderr.nice-error-message | Douwe Maan | 2015-04-06 | 3 | -21/+36 | |
| | | | | ||||||
| | * | | Write GitlabAccess error to stderr. | Douwe Maan | 2015-04-06 | 2 | -11/+13 | |
| |/ / | ||||||
 |
index : delta/gitlab/gitlab-shell.git | |
| gitlab.com: gitlab-org/gitlab-shell.git |
| summaryrefslogtreecommitdiff |