summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support calling internal API using HTTPSid-api-httpsIgor Drozdov2019-05-0110-16/+263
|
* Merge branch 'id-api-regular-http' into 'master'Nick Thomas2019-04-2415-140/+348
|\ | | | | | | | | Support calling internal api using HTTP See merge request gitlab-org/gitlab-shell!295
| * Support calling internal api using HTTPIgor2019-04-2415-140/+348
|/
* Merge branch 'go-migration-feature-flags-doc' into 'master'Nick Thomas2019-04-171-0/+37
|\ | | | | | | | | Add doc about Go migration feature flags See merge request gitlab-org/gitlab-shell!296
| * Add doc about Go migration feature flagsPatrick Bajao2019-04-171-0/+37
|/
* Merge branch 'fix-determine-root-dir' into 'master'Ash McKenzie2019-04-124-19/+119
|\ | | | | | | | | Correctly determine the root directory for gitlab-shell See merge request gitlab-org/gitlab-shell!294
| * Pass the root directory into the fallback commandNick Thomas2019-04-124-12/+99
| |
| * Correctly determine the root directory for gitlab-shellNick Thomas2019-04-121-11/+24
|/ | | | Credit to https://gitlab.com/ejiek for spotting this one.
* Merge branch '170-add-ash-as-a-maintainer-for-gitlab-shell' into 'master'Douglas Barbosa Alexandre2019-04-111-0/+2
|\ | | | | | | | | | | | | Add Ash as a maintainer for gitlab-shell Closes #170 See merge request gitlab-org/gitlab-shell!260
| * Add @ashmckenzie as a code ownerAsh McKenzie2019-04-111-2/+2
| |
| * Add CODEOWNERS for existing code ownersAsh McKenzie2019-04-111-0/+2
|/
* Merge branch 'release-9-0-0' into 'master'v9.0.0Nick Thomas2019-04-042-1/+8
|\ | | | | | | | | Release v9.0.0 See merge request gitlab-org/gitlab-shell!293
| * Release v9.0.0Nick Thomas2019-04-042-1/+8
|/
* Merge branch ↵Nick Thomas2019-04-046-9/+90
|\ | | | | | | | | | | | | '9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primary' into 'master' Display console messages, if available See merge request gitlab-org/gitlab-shell!287
| * Print console messages to $stderr if present9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primaryAsh McKenzie2019-04-043-4/+25
| | | | | | | | Using ConsoleHelper::write_stderr
| * Use write_stderr instead of $stderr.putsAsh McKenzie2019-04-042-5/+10
| |
| * New ConsoleHelper moduleAsh McKenzie2019-04-042-0/+55
|/ | | | | .write_stderr .format_for_stderr
* Merge branch ↵Douglas Barbosa Alexandre2019-04-041-0/+1
|\ | | | | | | | | | | | | | | | | '182-lib-gitlab_net-rb-37-in-check_access-uninitialized-constant-gitlabnet-gitaccessstatus-nameerror' into 'master' Explicitly include gitlab_access_status.rb Closes #182 See merge request gitlab-org/gitlab-shell!292
| * Explicitly include gitlab_access_status.rbAsh McKenzie2019-04-041-0/+1
|/
* Merge branch 'remove-hooks' into 'master'Nick Thomas2019-04-0311-998/+11
|\ | | | | | | | | Remove hooks, they belong to Gitaly now See merge request gitlab-org/gitlab-shell!291
| * Remove hooks, they belong to Gitaly nowJacob Vosmaer2019-04-0311-998/+11
|/
* 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
View Lorry Controller Status