summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'revert-lfs-authenticate' into 'master' v2.6.8ui-dev-kitDmitriy Zaporozhets2015-11-253-4/+3
|\ | | | | | | | | | | | | | | | | | | | | Revert "Run git-lfs-authenticate script with original command line arguments" This reverts commit 8449979ff029af51be0c675c5b6262bc4adc8b3d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Related to: #35, gitlab/gitlabhq#2635 See merge request !68
| * Bump version to 2.6.8Dmitriy Zaporozhets2015-11-252-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Return changelog item for 2.6.6Dmitriy Zaporozhets2015-11-251-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Run git-lfs-authenticate script with original command line arguments"Dmitriy Zaporozhets2015-11-252-3/+1
|/ | | | | | This reverts commit 8449979ff029af51be0c675c5b6262bc4adc8b3d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Bump version to 2.6.7v2.6.7Douwe Maan2015-11-182-1/+3
|
* Merge branch 'mirror-repository' into 'master' Robert Speicher2015-11-172-10/+43
|\ | | | | | | | | | | | | Add fetch-remote command for repo mirroring Also exits `import-repository` with non-zero status when import fails. See merge request !29
| * Add changelog entriesmirror-repositoryDouwe Maan2015-11-171-4/+8
| |
| * Add fetch-remote commandDouwe Maan2015-11-111-0/+25
| |
| * Exit with non-zero status when import-repository failsDouwe Maan2015-11-111-6/+10
| |
* | Revert "Merge branch 'use-load-path' into 'master' "Dmitriy Zaporozhets2015-11-126-17/+8
| | | | | | | | | | This reverts commit ae498b6cd4122d3d7f35e6b73b50c53615ca3488, reversing changes made to 79fdf65c71e90773fbf52d6832b74cf5a7124755.
* | Merge branch 'y/httpunix2' into 'master' Dmitriy Zaporozhets2015-11-124-2/+118
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to connect gitlab-shell to Unicorn via UNIX socket (v2) Hello up there. I'm doing SlapOS port of GitLab, and that means several different services could be running on the same machine, including several GitLabs. So far all internal GitLab subservices could be glued together via UNIX sockets except gitlab-shell -> Unicorn link, which, when done via local TCP, requires firewall/network namespaces to protect services on one machine from each other. On the other hand access to UNIX domain sockets is managed via regular UNIX permissions on filesystem, and thus is easier to manage. Besides UNIX domain sockets are well known to be faster compared to TCP over loopback - in particular to have ~ 2 times less latency and ~ 2 times more throughput. From this point of view it makes sense to teach gitlab-shell to talk to Unicorn via UNIX socket and switch to that mode by default eventually. I've just made a patch for this. Please apply. Thanks beforehand, Kirill /cc @dzaporozhets, @jacobvosmaer, @rspeicher See merge request !30
| * | Add support to connect gitlab-shell to Unicorn via UNIX socketKirill Smelkov2015-11-104-2/+118
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is well known that UNIX sockets are faster than TCP over loopback. E.g. on my machine according to lmbench[1] they have ~ 2 times lower latency and ~ 2-3 times more throughput compared to TCP over loopback: *Local* Communication latencies in microseconds - smaller is better --------------------------------------------------------------------- Host OS 2p/0K Pipe AF UDP RPC/ TCP RPC/ TCP ctxsw UNIX UDP TCP conn --------- ------------- ----- ----- ---- ----- ----- ----- ----- ---- teco Linux 4.2.0-1 13.8 29.2 26.8 45.0 47.9 48.5 55.5 45. *Local* Communication bandwidths in MB/s - bigger is better ----------------------------------------------------------------------------- Host OS Pipe AF TCP File Mmap Bcopy Bcopy Mem Mem UNIX reread reread (libc) (hand) read write --------- ------------- ---- ---- ---- ------ ------ ------ ------ ---- ----- teco Linux 4.2.0-1 1084 4353 1493 2329.1 3720.7 1613.8 1109.2 3402 1404. The same ratio usually holds for servers. Also UNIX sockets, since they reside on filesystem, besides being faster with less latency, have one another nice property: access permissions to them are managed the same way access to files is. Because of lower latencies and higher throughput - for performance reasons, and for easier security, it makes sense to interconnect services on one machine via UNIX sockets and talk via TCP only to outside world. All internal services inside GitLab can talk to each other via UNIX socket already and only gitlab-shell was missing support to talk to Unicorn via UNIX socket. Let's teach gitlab-shell to talk via UNIX sockets. [1] http://www.bitmover.com/lmbench/ ~~~~ In this patch we - add URI::HTTPUNIX to handle http+unix:// URI scheme - add Net::HTTPUNIX to handle "connect via unix socket and then talk http" - adjust GitlabNet#http_client_for() accordingly - adjust documentation in config.yml.example The http+unix:// scheme is not reinvented anew: the idea about its structure is quite logical an was already established at least in requests-unixsocket python package: http://fixall.online/theres-no-need-to-reinvent-the-wheelhttpsgithubcommsabramorequests-unixsocketurl/241810/ https://github.com/msabramo/requests-unixsocket
* | Merge branch 'use-load-path' into 'master' Dmitriy Zaporozhets2015-11-126-8/+17
|\ \ | |/ |/| | | | | | | | | Use load path, set ROOT_PATH via ENV Uses load path instead of require_relative, adds an environment variable to set gitlab-shell ROOT_PATH variable (Fixes #30) See merge request !28
| * use SHELL_ROOT_PATH variable to set ROOT_PATHPirate Praveen2015-11-101-1/+5
| |
| * use load path instead of require_relativePirate Praveen2015-11-105-7/+12
|/
* Merge branch 'shared-runner' into 'master' Jacob Vosmaer2015-11-101-3/+4
|\ | | | | | | | | | | | | Adapt gitlab-ci.yml for shared runners After merging this we should disconnect the specific runner on gitlab-org/gitlab-shell. See merge request !27
| * Mess with PATHJacob Vosmaer2015-11-101-2/+2
| |
| * Just install everythingJacob Vosmaer2015-11-101-1/+1
| |
| * Add apt-get updateJacob Vosmaer2015-11-101-0/+1
| |
| * Install git-annex (as root) during testsJacob Vosmaer2015-11-101-1/+1
| |
| * Adapt gitlab-ci.yml for shared runnersJacob Vosmaer2015-11-101-1/+1
|/
* Merge branch 'bump_2.6.6' into 'master' v2.6.6Dmitriy Zaporozhets2015-10-222-2/+2
|\ | | | | | | | | | | | | Version bump 2.6.6 See merge request !22
| * 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
| | * 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
|\ \ | |/ |/| | | | | | | | | | | Skip 'git annex init' when using 'gcryptsetup' 'gcryptsetup' is a special git-annex feature that does its own initialization. See merge request !18
| * Update CHANGELOGJacob Vosmaer2015-10-011-0/+1
| |
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into ↵Jacob Vosmaer2015-10-015-5/+68
| |\ | |/ |/| | | no-init-on-gcryptsetup
* | Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate'Dmitriy Zaporozhets2015-09-102-0/+3
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | 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
|\ \ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Do not clean LANG environment variable for the git hooks when working ↵Artem V. Navrotskiy2015-09-092-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.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-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-symlinkJacob Vosmaer2015-08-122-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-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
View Lorry Controller Status