summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove hooks, they belong to Gitaly nowremove-hooksJacob Vosmaer2019-04-0310-992/+9
|
* Merge branch 'display-post-receive-warnings' into 'master'Nick Thomas2019-04-012-8/+28
|\ | | | | | | | | Display post receive warnings from Rails See merge request gitlab-org/gitlab-shell!288
| * Rename print_broadbast method to be genericdisplay-post-receive-warningsLuke Duncalfe2019-04-012-4/+4
| | | | | | | | | | | | print_warnings is now using that method in order to print a large formatted warning message, so renaming the method to be less tied to the broadcast message functionality.
| * Fixing whitespace issues in specLuke Duncalfe2019-03-291-8/+8
| |
| * Allow GitlabPostReceive to print warningsLuke Duncalfe2019-03-282-0/+20
| | | | | | | | | | | | Warnings are printed using the same method that prints broadcast messages. This ensures that whatever warnings are returned will be displayed correctly.
* | Merge branch 'add-pry' into 'master'Rémy Coutable2019-04-013-0/+7
|\ \ | | | | | | | | | | | | Add pry gem to allow easy debugging See merge request gitlab-org/gitlab-shell!289
| * | Add pry gem for easy debuggingadd-pryLuke Duncalfe2019-03-293-0/+7
| |/
* | Merge branch 'id-go-recovery-codes' into 'master'Nick Thomas2019-03-2121-140/+825
|\ \ | | | | | | | | | | | | Provide go implementation for 2fa_recovery_codes command See merge request gitlab-org/gitlab-shell!285
| * | Provide go implementation for 2fa_recovery_codes commandIgor2019-03-2121-140/+825
|/ /
* | Merge branch 'an-improve-test-coverage' into 'master'Nick Thomas2019-03-193-0/+177
|\ \ | | | | | | | | | | | | Better testing for JSON deserialisation See merge request gitlab-org/gitlab-shell!282
| * | Better testing for JSON deserialisationan-improve-test-coverageAndrew Newdigate2019-03-183-0/+177
|/ / | | | | | | | | | | | | | | Adds tests to ensure that JSON deserialisation from program arguments takes place. This was a testing blind spot, which led to a brief regression: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/280
* | Merge branch 'bvl-discover-command' into 'master'Nick Thomas2019-03-1513-20/+729
|\ \ | | | | | | | | | | | | | | | | | | Call gitlab "/internal/discover" from go Closes #175 See merge request gitlab-org/gitlab-shell!283
| * | Wrap Stderr & Stdout in a reporter structBob Van Landuyt2019-03-158-37/+96
| | | | | | | | | | | | | | | The reporter struct can be used for passing around and reporting to the io.Writer of choice.
| * | Detect user based on key, username or idBob Van Landuyt2019-03-149-9/+659
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows gitlab-shell to be called with an argument of the format `key-123` or `username-name`. When called in this way, `gitlab-shell` will call the GitLab internal API. If the API responds with user information, it will print a welcome message including the username. If the API responds with a successful but empty response, gitlab-shell will print a welcome message for an anonymous user. If the API response includes an error message in JSON, this message will be printed to stderr. If the API call fails, an error message including the status code will be printed to stderr.
* | Merge branch 'bvl-parse-secret' into 'master'Nick Thomas2019-03-1314-87/+343
|\ \ | | | | | | | | | | | | Get secret from config See merge request gitlab-org/gitlab-shell!284
| * | Get secret from configBob Van Landuyt2019-03-138-87/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds parsing if the `secret_file` from YAML. And reads the contents of the configured file. If no file is configured, we fall back to the `.gitlab_shell_secret` in the root dir of the configuration. If the configured path does not start with a `/` we start looking for the file relative to the root dir of the configuration.
| * | Vendor otiai10/copyBob Van Landuyt2019-03-136-0/+161
|/ /
* | Merge branch 'release-8-7-1' into 'master'v8.7.1Nick Thomas2019-03-062-1/+4
|\ \ | | | | | | | | | | | | Release v8.7.1 See merge request gitlab-org/gitlab-shell!281
| * | Release v8.7.1Nick Thomas2019-03-062-1/+4
|/ /
* | Merge branch 'fix-json-unmarshal' into 'master'Stan Hu2019-03-063-3/+3
|\ \ | | | | | | | | | | | | Fix unmarshalling JSON from the command line See merge request gitlab-org/gitlab-shell!280
| * | Fix unmarshalling JSON from the command lineNick Thomas2019-03-063-3/+3
|/ /
* | Merge branch 'release-8-7' into 'master'v8.7.0Nick Thomas2019-03-062-1/+4
|\ \ | | | | | | | | | | | | Release v8.7.0 See merge request gitlab-org/gitlab-shell!279
| * | Release v8.7.0Nick Thomas2019-03-062-1/+4
|/ /
* | Merge branch 'an-distributed-tracing' into 'master'Nick Thomas2019-03-04139-223/+18904
|\ \ | |/ |/| | | | | Add distributed tracing to GitLab-Shell See merge request gitlab-org/gitlab-shell!277
| * Adds distributed tracing instrumentation to GitLab-Shellan-distributed-tracingAndrew Newdigate2019-03-0112-223/+326
| | | | | | | | Adds distributed tracing instrumentation to GitLab-Shell using LabKit
| * Add testify/require to vendored packagesAndrew Newdigate2019-02-268-0/+2274
| |
| * Vendor LabKit into GitLab-ShellAndrew Newdigate2019-02-25120-0/+16304
| | | | | | | | Done using `govendor fetch -v gitlab.com/gitlab-org/labkit/...@master`
* | Merge branch 'doc-update-about-hooks' into 'master'Douwe Maan2019-02-281-4/+17
|\ \ | |/ |/| | | | | Update readme notes about git hooks See merge request gitlab-org/gitlab-shell!278
| * Update readme notes about git hooksJacob Vosmaer2019-02-281-4/+17
|/
* Merge branch 'sh-release-gitlab-8-6-0' into 'master'v8.6.0Nick Thomas2019-02-192-1/+5
|\ | | | | | | | | Release v8.6.0 See merge request gitlab-org/gitlab-shell!276
| * Release v8.6.0sh-release-gitlab-8-6-0Stan Hu2019-02-182-1/+5
|/
* Merge branch 'sh-use-gl-project-path' into 'master'Nick Thomas2019-02-187-5/+21
|\ | | | | | | | | Add support for using gl_project_path See merge request gitlab-org/gitlab-shell!275
| * Add support for using gl_project_pathsh-use-gl-project-pathStan Hu2019-02-167-5/+21
|/ | | | | | This will enable us to track the human-readable project path with SSH access in gitlab-shell. Currently the Gitaly logs will only show the hashed storage and gl_repository path (e.g. project-1234).
* Merge branch ↵Robert Speicher2019-02-142-24/+57
|\ | | | | | | | | | | | | '57353-git-push-fails-on-large-lfs-files-where-the-push-take-a-long-time' into 'master' Provide expires_in for LFS if available See merge request gitlab-org/gitlab-shell!273
| * Provide expires_in for LFS if available57353-git-push-fails-on-large-lfs-files-where-the-push-take-a-long-timeAsh McKenzie2019-02-142-24/+57
| |
* | Merge branch 'sh-bump-gitaly-proto' into 'master'Nick Thomas2019-02-149-539/+1012
|\ \ | |/ |/| | | | | Bump gitaly-proto to v1.10.0 See merge request gitlab-org/gitlab-shell!274
| * Bump gitaly-proto to v1.10.0sh-bump-gitaly-protoStan Hu2019-02-129-539/+1012
|/ | | | | This is done to ensure we don't run into unknown fields as we saw in https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/364.
* Merge branch 'bvl-feature-flag-commands' into 'master'Nick Thomas2019-01-1559-73/+11626
|\ | | | | | | | | Parse commands to enable feature flags See merge request gitlab-org/gitlab-shell!270
| * Don't fall back to ruby for non SSH connectionsbvl-feature-flag-commandsBob Van Landuyt2019-01-153-27/+30
| | | | | | | | | | When SSH_CONNECTION is not set, we don't fall back to ruby, but instead fail directly in go writing the error to stderr.
| * Allow enabling gitlab-shell "discover"-featureBob Van Landuyt2019-01-1511-69/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the possibility to enable features for GitLab shell. The first feature being recognized is "Discover": It's the command that is executed when running `ssh git@gitlab.example.com` and is called without a command. The gitlab key id or username is already parsed from the command line arguments. Currently we only support communicating with GitLab-rails using unix sockets. So features will not be enabled if the GitLab-url is using a different protocol. The url for this read from the config yaml. Pending ruby-specs have been added for the gitlab-shell command. Refactor to have separate command packages
| * Vendor testifyBob Van Landuyt2019-01-1448-0/+11112
|/ | | | Add testify as test helpers
* Merge branch 'bvl-force-install-bundler' into 'master'Nick Thomas2019-01-091-2/+2
|\ | | | | | | | | Force install bunder See merge request gitlab-org/gitlab-shell!272
| * Force install bunderbvl-force-install-bundlerBob Van Landuyt2019-01-091-2/+2
|/ | | | | | | | This avoids errors like: $ gem install --bindir /usr/local/bin bundler -v "$INSTALL_BUNDLER_VERSION" ERROR: Error installing bundler: "bundle" from bundler conflicts with /usr/local/bin/bundle
* Merge branch 'remove-gitaly-proto-helper' into 'master'Nick Thomas2019-01-073-84/+0
|\ | | | | | | | | Remove unused vendored code See merge request gitlab-org/gitlab-shell!265
| * Remove unused vendored coderemove-gitaly-proto-helperJacob Vosmaer2018-12-173-84/+0
| |
* | Merge branch 'bvl-specify-bundler-version' into 'master'Douwe Maan2019-01-041-1/+8
|\ \ | | | | | | | | | | | | Specify bundler 1.17 for ruby 2.1 and 2.2 See merge request gitlab-org/gitlab-shell!271
| * | Specify bundler 1.17 for ruby 2.1 and 2.2Bob Van Landuyt2019-01-041-1/+8
|/ /
* | Merge branch 'better-use-of-constants' into 'master'Douwe Maan2018-12-211-5/+5
|\ \ | | | | | | | | | | | | Make better use of constants in lib/gitlab_shell.rb See merge request gitlab-org/gitlab-shell!269
| * | Make better use of constants in lib/gitlab_shell.rbJacob Vosmaer2018-12-211-5/+5
|/ /
* | Merge branch 'gitaly-transistion-helpers' into 'master'Douwe Maan2018-12-203-3/+8
|\ \ | | | | | | | | | | | | Gitaly hook transistion changes See merge request gitlab-org/gitlab-shell!268
View Lorry Controller Status