summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added an optional --force parameter for gitlab-projects fetch-remotefeature/fetch-remote-forcedGabriel Mazetto2016-03-032-2/+7
| | | | | | The optional parameter will decide wheter to fetch using --force or not. fetching with --force is a requirement for Gitlab Geo secondary node replication.
* Merge branch 'fix/ruby-2.2-webrick' into 'master' Jacob Vosmaer2016-02-102-0/+39
|\ | | | | | | | | | | | | workaround for webrick issue on ruby 2.2 Workaround that fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/36 See merge request !38
| * trying new workaround for shutdown_pipe issueJames Lopez2016-02-101-2/+14
| |
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into ↵James Lopez2016-02-103-9/+24
| |\ | |/ |/| | | fix/ruby-2.2-webrick
* | Merge branch 'net-read-timeout' into 'master' Douwe Maan2016-02-093-7/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase HTTP timeout and log request durations On some GitLab deployments internal API calls regularly take more than 60 seconds (the default HTTP read timeout of Ruby's Net::HTTP). Until we understand the cause of this slowness, by raising the client timeout in gitlab-shell we can at least spare end users having to retry their `git pull` or `git push`. See merge request !37
| * | Actually use the read_timeout config optionJacob Vosmaer2016-02-092-2/+6
| | |
| * | Log duration of HTTP API requestsnet-read-timeoutJacob Vosmaer2016-02-091-0/+5
| | |
| * | Use an HTTP timeout of 5 minutes by defaultJacob Vosmaer2016-02-092-6/+12
| | |
* | | Merge branch 'relative_url_info' into 'master' Douwe Maan2016-02-091-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add relative URL info Relevant MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2770 See merge request !36
| * | Add relative URL inforelative_url_infoAchilleas Pipinellis2016-02-091-2/+2
|/ / | | | | | | [ci skip]
| * typoJames Lopez2016-02-101-2/+2
| |
| * added build for both ruby 2.1 and 2.2James Lopez2016-02-101-0/+22
| |
| * workaround for webrick issue on ruby 2.2James Lopez2016-02-091-0/+5
|/
* Merge branch 'master' into 'master' v2.6.10Douwe Maan2016-01-054-3/+21
|\ | | | | | | | | | | | | | | | | Added git gc for housekeeping This merge request will add the gc functionality used by the housekeeping function in the project settings page. see gitlab-org/gitlab-ce#3041 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1658 See merge request !23
| * Version bumped to 2.6.10Jeroen Nijhof2016-01-042-1/+4
| |
| * Merge branch 'master' of https://gitlab.com/jnijhof/gitlab-shellJeroen Nijhof2016-01-042-2/+17
| |\ |/ / | | | | | | Conflicts: lib/gitlab_projects.rb
| * Check if path exists for gcJeroen Nijhof2015-11-191-0/+4
| |
| * Added git gc for housekeepingJeroen Nijhof2015-10-212-3/+14
| |
* | Merge branch 'remove-trailing-slashes' into 'master' v2.6.9Douwe Maan2015-12-145-7/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | Remove trailing slashes from gitlab_url They do not play nice with gitlab-workhorse (or rather Golang net/http DefaultServemux). See merge request !35
| * | Update VERSION and CHANGELOG for 2.6.9Jacob Vosmaer2015-12-142-1/+4
| | |
| * | Be more consistent about default gitlab_urlremove-trailing-slashesJacob Vosmaer2015-12-112-2/+2
| | |
| * | Remove trailing slashes from gitlab_urlJacob Vosmaer2015-12-113-6/+12
| | | | | | | | | | | | | | | They do not play nice with gitlab-workhorse (or rather Golang net/http DefaultServemux).
* | | Merge branch 'stricter-exec_cmd' into 'master' Dmitriy Zaporozhets2015-12-013-37/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stricter exec cmd In response to the gitlab-shell 2.6.6-2.6.7 remote code execution vulnerability. See merge request !33
| * | | Add comment about untrusted origin_cmdstricter-exec_cmdJacob Vosmaer2015-11-261-0/+3
| | | |
| * | | Add spec for stricter exec_cmd checksJacob Vosmaer2015-11-251-0/+9
| | | |
| * | | Limit availability of SSH_ORIGINAL_COMMANDJacob Vosmaer2015-11-253-37/+35
| | | | | | | | | | | | | | | | | | | | Hoping this makes it more obvious when code touches the very unsafe contents of this variable.
| * | | Disallow execing stringsJacob Vosmaer2015-11-251-0/+7
| |/ / | | | | | | | | | Passing strings to Kernel::exec leads to remote code execution.
* | | Merge branch 'y/git-home' into 'master' Dmitriy Zaporozhets2015-11-251-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass $HOME to git as well [ this patch has the same rationale and reasoning as https://gitlab.com/gitlab-org/gitlab-workhorse/commit/0d0bd209 details follow ] Git has 3 places for configs: - system - global (per user), and - local (per repository) System config location is hardcoded at git compile time (to usually $prefix/etc/gitconfig). Local configuration is usually picked because we pass full repo path to subcommand. But global configuration is currently not picked at all, because HOME env variable is not passed to git. Pass $HOME through and let git see it's "global" config. Currently GitLab omnibus stores gitlab user name/email + "autocrlf = true" in global config, so missing it should not be a blocker for receive/send-pack operations. But having it is more correct and can be handy in the future if/when more git operations are done from-under gitlab-shell. Having $HOME properly set is also needed when one cannot change system git config and have to put site-wide configuration into global git config under $HOME. That was the case I've hit and the reason for this patch. /cc @dzaporozhets, @jacobvosmaer See merge request !32
| * | Pass $HOME to git as wellKirill Smelkov2015-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ this patch has the same rationale and reasoning as https://gitlab.com/gitlab-org/gitlab-workhorse/commit/0d0bd209 details follow ] Git has 3 places for configs: - system - global (per user), and - local (per repository) System config location is hardcoded at git compile time (to usually $prefix/etc/gitconfig). Local configuration is usually picked because we pass full repo path to subcommand. But global configuration is currently not picked at all, because HOME env variable is not passed to git. Pass $HOME through and let git see it's "global" config. Currently GitLab omnibus stores gitlab user name/email + "autocrlf = true" in global config, so missing it should not be a blocker for receive/send-pack operations. But having it is more correct and can be handy in the future if/when more git operations are done from-under gitlab-shell. Having $HOME properly set is also needed when one cannot change system git config and have to put site-wide configuration into global git config under $HOME. That was the case I've hit and the reason for this patch.
* | | 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
|/ /
View Lorry Controller Status