delta/gitlab/gitlab-shell.git, branch no-init-on-gcryptsetup gitlab.com: gitlab-org/gitlab-shell.git Skip 'git annex init' when using 'gcryptsetup' 2015-08-11T15:53:15+00:00 Jacob Vosmaer contact@jacobvosmaer.nl 2015-08-11T15:50:38+00:00 979a6df4755a114e38cd1825be40cb07225f1fb4 'gcryptsetup' is a special git-annex feature that does its own initialization. 
'gcryptsetup' is a special git-annex feature that does its own
initialization.
Merge branch 'version_bump' into 'master' 2015-08-05T10:45:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2015-08-05T10:45:57+00:00 c31e6165016e4f12483b4c328a62493adac1bcac Version bump 2.6.4 See merge request !17 

Version bump 2.6.4



See merge request !17
 Version bump 2.6.4 2015-08-05T10:26:35+00:00 Valery Sizov vsv2711@gmail.com 2015-08-05T10:26:35+00:00 d43ca83d404dfb070a25042a83814ee65070ead1 






Merge branch 'git_annex_env_variable'
2015-08-04T13:21:34+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-08-04T13:21:34+00:00

99f07fd2a11b9e226ee39d6018f41cf282cedf86












Merge branch 'batch-add-keys-timeout'
2015-07-17T16:04:29+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-07-17T16:04:29+00:00

3c97aea3e7cceaa5f212e72bfade28883685d21b

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Merge branch 'faster-rm-key' into 'master'

2015-07-17T16:01:21+00:00

Dmitriy Zaporozhets
dzaporozhets@gitlab.com

2015-07-17T16:01:21+00:00

27af59cc3cb57ded15edc0e6c2b9ecc644790e67


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

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






If git-annex is enabled set GIT_ANNEX_SHELL_LIMITED variable.
2015-07-16T12:41:25+00:00

Marin Jankovski
maxlazio@gmail.com

2015-07-16T12:41:25+00:00

919e70c86a8dac08de0705310d2b6d6b21e022c3












Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell
2015-07-16T10:14:49+00:00

Marin Jankovski
maxlazio@gmail.com

2015-07-16T10:14:49+00:00

7b692799adde84433a37b250c5d7e36483fbf5f7












Increase batch_add_keys lock timeout to 300 seconds
2015-07-16T08:22:56+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2015-07-16T08:22:56+00:00

1bfa3fda1d466e1ef97c3e4106b8b3d7fbe5f020












Remove keys from authorized_keys in-place
2015-07-16T08:10:46+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2015-07-16T08:10:46+00:00

4fd8e44ba12d126b0553b90c099d1b63fa163d00

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'.





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'.