summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | This provides the integration point to the internal API to get the ssh key from the internal API.
* 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 required commands to update remote mirrors Closes gitlab-org/gitlab-ee#116 See merge request !43
| * 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.md
| | * Update README.mdElan Ruusamäe2016-02-231-1/+1
| |/ | | | | trivial spelling fix
* | Merge branch 'fix/git-annex-ssh' into 'master' v2.6.12Douwe Maan2016-03-184-5/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix git-annex issue when using SSH on a custom port Easiest thing here is to use the full repo path on the server side. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/166 See merge request !45
| * | 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' This is a workaround to reduce the impact of https://gitlab.com/gitlab-org/gitlab-ce/issues/13524 . See merge request !44
| * | Do not prune objects during 'git gc'Jacob Vosmaer2016-03-141-1/+1
|/ / | | | | | | | | This is a workaround to reduce the impact of https://gitlab.com/gitlab-org/gitlab-ce/issues/13524 .
* | Update CHANGELOG for 2.6.11v2.6.11Rémy Coutable2016-03-081-0/+5
| | | | | | | | [ci skip]
* | Merge branch 'feature/fetch-remote-forced' into 'master' Douwe Maan2016-03-032-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an optional --force parameter for gitlab-projects fetch-remote The optional parameter will decide wheter to fetch using --force or not. fetching with --force is a requirement for Gitlab Geo (https://gitlab.com/gitlab-org/gitlab-ee/issues/76) secondary node replication. This is a dependency for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/179 See merge request !41
| * | 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
|/ / | | | | | | | | | | 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
| | | |
View Lorry Controller Status