summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Release v8.1.1v8.1.18-1-stableNick Thomas2018-08-092-1/+4
|
* Merge branch 'fix-ssh-certificate-regressions-8-1' into '8-1-stable'Stan Hu2018-08-094-2/+172
|\ | | | | | | | | Fix two regressions in SSH certificate support (8.1) See merge request gitlab-org/gitlab-shell!226
| * Guard discovery by username or key against bad API responsesNick Thomas2018-08-091-1/+1
| |
| * Harden gitlab-shell against arguments following the gl_id parameter in the ↵Nick Thomas2018-08-092-4/+4
| | | | | | | | command line
| * Fix two regressions in SSH certificate supportÆvar Arnfjörð Bjarmason2018-08-084-2/+172
|/ | | | | | | | | | | | | | | Fix two regressions in my 2e8b670 ("Add support for SSH certificate authentication", 2018-06-14) merged in gitlab-org/gitlab-shell!207. This fixes the issue noted in gitlab-org/gitlab-shell#145 where the command-line contains things other than the key/user/username, and also a regression where SSH certificates are being used, and the username presented in the key is unknown to GitLab. In that case, we should log the user in as "Anonymous" (on an instance that allows public access), but because of how the error checking around api.discover() was implemented we ended up erroring out instead.
* Merge branch 'release-gitlab-8-1' into 'master'v8.1.0Nick Thomas2018-08-012-2/+4
|\ | | | | | | | | Release v8.1.0 See merge request gitlab-org/gitlab-shell!219
| * Release v8.1.0Nick Thomas2018-08-012-2/+4
|/
* Merge branch 'add-protocol-v2-logic' into 'master'Nick Thomas2018-08-016-39/+61
|\ | | | | | | | | Add Git protocol v2 See merge request gitlab-org/gitlab-shell!217
| * use GIT_PROTOCOL env variable in gitlab_shell#execJames Lopez2018-08-012-2/+6
| |
| * update gitlab shell to remove git_protocol env varJames Lopez2018-08-012-2/+0
| |
| * Add Git protocol v2James Lopez2018-08-016-40/+60
|/
* Merge branch 'release-version-8' into 'master'v8.0.0Nick Thomas2018-07-312-1/+4
|\ | | | | | | | | Release GitLab Shell v8.0.0 See merge request gitlab-org/gitlab-shell!218
| * Release GitLab Shell v8.0.0Nick Thomas2018-07-312-1/+4
|/
* Merge branch 'user-argument-2/upstream' into 'master'Nick Thomas2018-07-319-55/+192
|\ | | | | | | | | | | | | Add support for ssh certificates Closes gitlab-ce#34572 See merge request gitlab-org/gitlab-shell!207
| * Add support for SSH certificate authenticationÆvar Arnfjörð Bjarmason2018-07-269-55/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This along with the code submitted to gitlab-ce in the gitlab-org/gitlab-ce! MR implements SSH certificate authentication. See the docs added to gitlab-ce for why and how to enable this. This, along with that MR, closes gitlab-org/gitlab-ce#3457 Implementation notes: - Because it's easy to do, and because an earlier nascent version of this would pass user-ID to gitlab-shell, that's now supported, even though the SSH certificate authentication uses username-USERNAME. - The astute reader will notice that not all the API calls in gitlab-ce's lib/api/internal.rb support a "username" argument, some only support "user_id". There's a few reasons for this: a) For this to be efficient, I am bending over backwards to avoid extra API calls when using SSH certificates. Therefore the /allowed API call will now return a "user id" to us if we're allowed to proceed further. This is then fed to existing APIs that would only be called after a successful call to /allowed. b) Not all of the git-shell codepaths go through /internal/allowed, or ever deal with a repository, e.g. the argument-less "Welcome to GitLab", and /internal/2fa_recovery_codes. These need to use /internal/discover to figure out details about the user, so support looking that up by username. c) Once we have the "user id", the GL_ID gets passed down to e.g. user-authored hooks. I don't want to have those all break by having to handle a third GL_ID mode of "username" in addition to the current "key id" and "user id".
* | Bump version to 7.2.0v7.2.0Douwe Maan2018-07-272-1/+4
| |
* | Merge branch 'update-gitaly-proto' into 'master'Douwe Maan2018-07-2716-715/+3151
|\ \ | |/ |/| | | | | Update gitaly-proto to 0.109.0 See merge request gitlab-org/gitlab-shell!216
| * Update gitaly-proto to 0.109.0James Lopez2018-07-2716-715/+3151
|/
* Merge branch 'doc-go-update-vendor' into 'master'Rémy Coutable2018-07-243-2/+40
|\ | | | | | | | | Add script to update vendored go libs See merge request gitlab-org/gitlab-shell!212
| * Add script to update vendored go libsJacob Vosmaer (GitLab)2018-07-243-2/+40
|/
* Merge branch 'ash.mckenzie/minor-tidy-up' into 'master'Robert Speicher2018-07-2312-212/+310
|\ | | | | | | | | Refactor for re-usability for future MR's See merge request gitlab-org/gitlab-shell!210
| * Rspec upgrade and deprecation fixesash.mckenzie/minor-tidy-upAsh McKenzie2018-07-208-49/+65
| |
| * Ignore 'Missing magic comment' Rubocop warningAsh McKenzie2018-07-201-0/+3
| | | | | | | | This was not posing an issue during CI, but was an issue locally.
| * Support HTTP headers and sending JSONAsh McKenzie2018-07-203-24/+79
| |
| * Rename HTTPHelper#host to #internal_api_endpointAsh McKenzie2018-07-203-20/+20
| |
| * Add #base_api_endpoint for re-usabilityAsh McKenzie2018-07-202-1/+13
| |
| * Move HTTP logic out into HTTPHelperAsh McKenzie2018-07-202-104/+111
| |
| * gem version tightening & updatesAsh McKenzie2018-07-202-33/+37
| |
| * Add .ruby-version to ensure Ruby 2.3.x is usedAsh McKenzie2018-07-201-0/+1
|/
* Bump version to 7.1.5v7.1.5Stan Hu2018-07-102-1/+4
|
* Merge branch 'go-ci-version' into 'master'Nick Thomas2018-06-201-2/+6
|\ | | | | | | | | Run go tests in CI with Go 1.9 and 1.10 See merge request gitlab-org/gitlab-shell!208
| * Run go build/test in CI with 1.9 and 1.10Jacob Vosmaer2018-06-201-2/+6
|/
* Merge branch '138-fix-pre-receive-hook' into 'master'Douwe Maan2018-06-131-1/+1
|\ | | | | | | | | | | | | Resolve "NoMethodError for nil in pre-receive hook" Closes #138 See merge request gitlab-org/gitlab-shell!206
| * Fix a NoMethodError in the pre-receive hookNick Thomas2018-06-121-1/+1
|/
* Merge branch 'winh-makes-it-2018' into 'master'Robert Speicher2018-06-111-1/+1
|\ | | | | | | | | | | | | Update LICENSE year to 2018 [ci skip] See merge request gitlab-org/gitlab-shell!205
| * Update LICENSE year to 2018Winnie Hellmann2018-06-111-1/+1
|/
* Merge branch 'issue-29006' into 'master'v7.1.4Douwe Maan2018-06-044-5/+149
|\ | | | | | | | | allow long strings to remain intact while parsing broadcast message See merge request gitlab-org/gitlab-shell!202
| * allow long strings to remain intact while parsing broadcast messageCameron Crockett2018-06-014-5/+149
|/ | | | | | | | | | | | | | Added fix for msg nil edge case. fixed comment wording code review issues, bumped version and changelog entry Fixed rebase issues Moved strip out of the function Fixes for code review comments Removed trailing whitespaces
* Merge branch 'bvl-display-username-instead-of-fullname' into 'master'v7.1.3Douwe Maan2018-05-284-9/+18
|\ | | | | | | | | | | | | Display the username instead of fullname Closes #131 See merge request gitlab-org/gitlab-shell!204
| * Bump version to 7.1.3bvl-display-username-instead-of-fullnameBob Van Landuyt2018-05-243-2/+11
| |
| * Display the username instead of fullnameBob Van Landuyt2018-05-233-8/+8
|/ | | | | | | | When running `ssh git@gitlab.example.com` we used to reply with the full name. But it might actually be more useful to display the username. This is unique and can help support identifying issues. Closes #131
* Merge branch 'setup_security_products' into 'master'Rémy Coutable2018-04-111-11/+45
|\ | | | | | | | | Setup security products. See merge request gitlab-org/gitlab-shell!201
| * Setup security products.Olivier Gonzalez2018-04-111-11/+45
|/
* Merge branch 'logger-error' into 'master'v7.1.2Douwe Maan2018-04-094-2/+28
|\ | | | | | | | | | | | | Add missing GitlabLogger#error method Closes #130 See merge request gitlab-org/gitlab-shell!200
| * Add missing GitlabLogger#error methodJacob Vosmaer (GitLab)2018-04-094-2/+28
|/
* Merge branch 'log-flush' into 'master'v7.1.1Douwe Maan2018-03-235-1/+32
|\ | | | | | | | | Flush log file after every write See merge request gitlab-org/gitlab-shell!199
| * Flush log file after every writeJacob Vosmaer (GitLab)2018-03-235-1/+32
|/
* Release v7.1.0v7.1.0Sean McGivern2018-03-211-1/+1
|
* Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-2122-666/+2457
|\ | | | | | | | | Add Gitaly git-upload-archive migrated command See merge request gitlab-org/gitlab-shell!192
| * Add Gitaly git-upload-archive migrated commandgitaly-upload-archiveAlejandro Rodríguez2018-03-2022-666/+2457
|/
View Lorry Controller Status