summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Invert clause when checking key for clarityuse-ssh-key-internal-apiPablo Carranza2016-03-241-3/+3
* Add empty key checkPablo Carranza2016-03-241-2/+2
* Add changelog and bumped versionPablo Carranza2016-03-242-1/+4
* Change the key format when generating the authorized key to match the legacy onePablo Carranza2016-03-241-1/+1
* Add encoding for the ssh key on the urlPablo Carranza2016-03-243-3/+5
* Change use of fingerprint for whole keyPablo Carranza2016-03-245-10/+10
* Change API endpoint to authorized_keysPablo Carranza2016-03-243-3/+3
* Add authorized keys bin script to find keys by fingerprintPablo Carranza2016-03-245-17/+48
* Add ssh-key resource get to gitlab_netPablo Carranza2016-03-245-0/+173
* Drop bang in stub method as it is deprecatedPablo Carranza2016-03-241-3/+3
* Merge branch 'gl_ee_issue_116' into 'master' v2.6.13Douwe Maan2016-03-213-1/+48
|\
| * Add new commands: push-branches and delete-remote-branches.Rubén Dávila2016-03-213-1/+48
|/
* Merge branch 'master' of github.com:gitlabhq/gitlab-shellStan Hu2016-03-201-1/+1
|\
| * Merge pull request #244 from glensc/patch-1Robert Schilling2016-02-231-1/+1
| |\
| | * Update README.mdElan Ruusamäe2016-02-231-1/+1
| |/
* | Merge branch 'fix/git-annex-ssh' into 'master' v2.6.12Douwe Maan2016-03-184-5/+16
|\ \
| * | updated spec context ant comment [ci-skip]fix/git-annex-sshJames Lopez2016-03-181-2/+2
| * | added comment to clarify specJames Lopez2016-03-161-0/+1
| * | update changelog and versionJames Lopez2016-03-162-1/+4
| * | get git annex to work when using custom SSH portJames Lopez2016-03-162-4/+11
|/ /
* | Merge branch 'gc-no-prune' into 'master' Robert Speicher2016-03-141-1/+1
|\ \
| * | Do not prune objects during 'git gc'Jacob Vosmaer2016-03-141-1/+1
|/ /
* | Update CHANGELOG for 2.6.11v2.6.11Rémy Coutable2016-03-081-0/+5
* | Merge branch 'feature/fetch-remote-forced' into 'master' Douwe Maan2016-03-032-2/+7
|\ \
| * | Remove redundant `|| false`Douwe Maan2016-03-031-1/+1
| * | 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