summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added an optional --force parameter for gitlab-projects fetch-remotefeature/fetch-remote-forcedGabriel Mazetto2016-03-032-2/+7
* Merge branch 'fix/ruby-2.2-webrick' into 'master' Jacob Vosmaer2016-02-102-0/+39
|\
| * trying new workaround for shutdown_pipe issueJames Lopez2016-02-101-2/+14
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into fix/ruby-2.2...James Lopez2016-02-103-9/+24
| |\ | |/ |/|
* | Merge branch 'net-read-timeout' into 'master' Douwe Maan2016-02-093-7/+22
|\ \
| * | 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 inforelative_url_infoAchilleas Pipinellis2016-02-091-2/+2
|/ /
| * 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
|\
| * 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
| |\ |/ /
| * 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
|\ \
| * | 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
* | | Merge branch 'stricter-exec_cmd' into 'master' Dmitriy Zaporozhets2015-12-013-37/+54
|\ \ \
| * | | 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
| * | | Disallow execing stringsJacob Vosmaer2015-11-251-0/+7
| |/ /
* | | Merge branch 'y/git-home' into 'master' Dmitriy Zaporozhets2015-11-251-0/+1
|\ \ \ | |/ / |/| |
| * | Pass $HOME to git as wellKirill Smelkov2015-11-241-0/+1
* | | Merge branch 'revert-lfs-authenticate' into 'master' v2.6.8ui-dev-kitDmitriy Zaporozhets2015-11-253-4/+3
|\ \ \ | |/ / |/| |
| * | Bump version to 2.6.8Dmitriy Zaporozhets2015-11-252-2/+2
| * | Return changelog item for 2.6.6Dmitriy Zaporozhets2015-11-251-0/+1
| * | Revert "Run git-lfs-authenticate script with original command line arguments"Dmitriy Zaporozhets2015-11-252-3/+1
|/ /
* | 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 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
* | | Merge branch 'y/httpunix2' into 'master' Dmitriy Zaporozhets2015-11-124-2/+118
|\ \ \
| * | | Add support to connect gitlab-shell to Unicorn via UNIX socketKirill Smelkov2015-11-104-2/+118
| |/ /
* | | Merge branch 'use-load-path' into 'master' Dmitriy Zaporozhets2015-11-126-8/+17
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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
|/ /