summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove the update-head command since GitLab doesn't use it anymoreremove-update-headRémy Coutable2016-04-155-50/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Bumped version to 2.7.2v2.7.2Yorick Peterse2016-04-071-1/+1
|
* Merge branch 'gc-prune-after-all' into 'master' Yorick Peterse2016-04-061-1/+1
|\ | | | | | | | | Prune during 'git gc' after all See merge request !48
| * Revert "Do not prune objects during 'git gc'"Jacob Vosmaer2016-04-061-1/+1
|/ | | | | | | This reverts commit 1ca8a44f0baa1728650308fe992f42660170ae16. Never pruning loose objects at all is not really a solution for anything, and it causes annoying `git gc --auto` warnings.
* Merge branch 'issue_39' into 'master' v2.7.1Douwe Maan2016-03-313-2/+28
|\ | | | | | | | | | | | | | | | | | | | | Add new command to list tags from a remote repo. The output of the `git ls-remote` command is written to the STDOUT so the client can read and parse the list of tags. If there is an error it's also written to STDOUT. Closes #39 See merge request !47
| * Bump VERSION and update CHANGELOG.Rubén Dávila2016-03-312-1/+4
| |
| * Add new command to list tags from a remote repo.Rubén Dávila2016-03-311-1/+24
|/ | | | | | The output of the `git ls-remote` command is written to the STDOUT so the client can read and parse the list of tags. If there is an error it's also written to STDOUT.
* Corrected version in CHANGELOG of latest releaseYorick Peterse2016-03-311-1/+1
| | | | [ci skip]
* Merge branch 'gl_ee_issue_116' into 'master' Douwe Maan2016-03-311-2/+6
|\ | | | | | | | | | | | | | | | | | | | | Add the ability to fetch remote repo without tags. When fetching remote repo with tags the new remote tags are mixed in with the local tags (all tags are saved under refs/tags), this affects the UI of the Project given that we're showing up tags of a remote repo. REF: https://gitlab.com/gitlab-org/gitlab-ee/issues/116 See merge request !46
| * Add the ability to fetch remote repo without tags.gl_ee_issue_116Rubén Dávila2016-03-301-2/+6
|/ | | | | | When fetching remote repo with tags the new remote tags are mixed in with the local tags (all tags are saved under refs/tags), this affects the UI of the Project given that we're showing up tags of a remote repo.
* Bumped version to 2.7.0v2.7.0Yorick Peterse2016-03-291-1/+1
|
* Merge branch 'use-ssh-key-internal-api' into 'master' Yorick Peterse2016-03-2910-15/+224
|\ | | | | | | | | Use ssh key internal api to build the authorized-keys command on openssh 6.9 See merge request !42
| * 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
|/
View Lorry Controller Status