summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade Gitaly to 1.68.0jc-upgrade-gitalyJohn Cai2019-10-1417-40/+105
| | | | Gitaly 1.68.0 upgrades gRPC to 1.24.0
* Merge branch 'remove-ruby-tag' into 'master'Ash McKenzie2019-10-111-10/+0
|\ | | | | | | | | Remove ruby tag from .gitlab-ci.yml See merge request gitlab-org/gitlab-shell!345
| * Remove ruby tag from .gitlab-ci.ymlNick Thomas2019-10-101-10/+0
|/
* Merge branch 'release-10-1' into 'master'v10.1.0Nick Thomas2019-10-092-1/+8
|\ | | | | | | | | Version 10.1.0 See merge request gitlab-org/gitlab-shell!344
| * Version 10.1.0Nick Thomas2019-10-092-1/+8
|/
* Merge branch '215-follow-up-from-rewrite-bin-check-in-go' into 'master'Ash McKenzie2019-10-091-7/+0
|\ | | | | | | | | | | | | Remove buildCheckAllowedEnv() test helper Closes #215 See merge request gitlab-org/gitlab-shell!343
| * Remove buildCheckAllowedEnv() test helperAsh McKenzie2019-10-091-7/+0
|/
* Merge branch '173-remove-bin-check' into 'master'Ash McKenzie2019-10-0911-33/+309
|\ | | | | | | | | Rewrite `bin/check` in Go See merge request gitlab-org/gitlab-shell!341
| * Rewrite bin/check in GoNick Thomas2019-10-0810-32/+306
| |
| * Intelligently rebuild binariesNick Thomas2019-10-081-1/+3
| |
* | Merge branch '173-remove-bin-install-command' into 'master'Ash McKenzie2019-10-093-7/+18
|\ \ | | | | | | | | | | | | Decouple `bin/compile` and `bin/install` from code in `lib/` See merge request gitlab-org/gitlab-shell!340
| * | Decouple bin/compile and bin/install from lib/Nick Thomas2019-10-083-7/+18
| |/ | | | | | | | | | | | | | | | | This commit duplicates a small amount of Ruby code that is run at build or install time. Over time, it would be nice to remove the dependency on Ruby for these steps, but the focus right now is on run-time. We'll be removing lib/* from gitlab-shell very soon, and these commands need to keep working when we do.
* | Merge branch '173-remove-create-hooks-script' into 'master'Ash McKenzie2019-10-092-51/+0
|\ \ | |/ |/| | | | | Remove deprecated create-hooks script See merge request gitlab-org/gitlab-shell!342
| * Remove deprecated create-hooks scriptNick Thomas2019-10-082-51/+0
|/
* Merge branch 'add-ip-address-to-call-to-rails-api' into 'master'Nick Thomas2019-10-084-0/+45
|\ | | | | | | | | Extend group IP restriction to Git activity See merge request gitlab-org/gitlab-shell!335
| * Clean upadd-ip-address-to-call-to-rails-apiMałgorzata Ksionek2019-10-0310-10/+9
| |
| * Add cr remarksMałgorzata Ksionek2019-10-032-3/+1
| |
| * Introduce changes from code reviewMałgorzata Ksionek2019-10-0310-74/+13
| |
| * Reverse ruby changesMałgorzata Ksionek2019-10-0124-24/+24
| |
| * Update methods to use new pathMałgorzata Ksionek2019-10-0131-41/+41
| |
| * Clean up filesMałgorzata Ksionek2019-09-304-5/+34
| |
| * Add cr remarksMałgorzata Ksionek2019-09-298-23/+53
| |
| * Add cr remarksMałgorzata Ksionek2019-09-264-9/+16
| |
| * Add code review remarksMałgorzata Ksionek2019-09-263-15/+16
| |
| * Add ip address to headersMałgorzata Ksionek2019-09-262-0/+42
| |
* | Merge branch 'cleanup-config-yml-example' into 'master'Ash McKenzie2019-10-031-5/+0
|\ \ | |/ |/| | | | | Remove an obsolete section from config.yml.example See merge request gitlab-org/gitlab-shell!339
| * Remove an obsolete section from config.yml.exampleNick Thomas2019-10-021-5/+0
|/
* Merge branch '173-remove-go-fallback-and-feature-flags' into 'master'Nick Thomas2019-09-249-372/+70
|\ | | | | | | | | Remove feature flags and the fallback command See merge request gitlab-org/gitlab-shell!336
| * Remove feature flags and the fallback commandNick Thomas2019-09-209-372/+70
| |
* | Merge branch 'build-go-1-13' into 'master'Nick Thomas2019-09-244-28/+59
|\ \ | |/ |/| | | | | Build against go1.13 See merge request gitlab-org/gitlab-shell!337
| * Test against go1.13Nick Thomas2019-09-201-0/+4
| |
| * Switch from 512-bit to 2048-bit keyNick Thomas2019-09-202-20/+47
| |
| * Fix logic errors in gitlabnet client testsNick Thomas2019-09-201-8/+8
|/
* Merge branch 'release-10-0-0' into 'master'v10.0.0Nick Thomas2019-09-042-1/+4
|\ | | | | | | | | Release v10.0.0 See merge request gitlab-org/gitlab-shell!333
| * Release v10.0.0Nick Thomas2019-09-042-1/+4
|/
* Merge branch 'pb-remove-gitlab-keys' into 'master'Nick Thomas2019-09-045-519/+1
|\ | | | | | | | | Remove gitlab-keys script See merge request gitlab-org/gitlab-shell!329
| * Remove gitlab-keys scriptPatrick Bajao2019-09-045-519/+1
| |
* | Merge branch 'vzagorodny-master-patch-03209' into 'master'Douwe Maan2019-09-022-4/+7
|\ \ | | | | | | | | | | | | Refactor "go build" path constants See merge request gitlab-org/gitlab-shell!328
| * | Refactor "go build" path constantsVictor Zagorodny2019-09-022-4/+7
|/ /
* | Merge branch 'release-9-4-2' into 'master'v9.4.2Nick Thomas2019-09-012-1/+4
|\ \ | | | | | | | | | | | | Release v9.4.2 See merge request gitlab-org/gitlab-shell!331
| * | Release v9.4.2release-9-4-2Patrick Bajao2019-08-302-1/+4
|/ /
* | Merge branch '202-repurpose-authorized-keys-script' into 'master'Ash McKenzie2019-08-301-22/+6
|\ \ | |/ |/| | | | | Repurpose bin/authorized_keys script See merge request gitlab-org/gitlab-shell!330
| * Repurpose bin/authorized_keys script202-repurpose-authorized-keys-scriptPatrick Bajao2019-08-301-22/+6
|/ | | | | | | | It's been replaced by `gitlab-shell-authorized-keys-check` and it's also calling the `/authorized_keys` endpoint via Ruby. Since they have the same functionality as the new binary, better to call that instead to make it SSOT for authorized keys requests.
* Release v9.4.1v9.4.1Douwe Maan2019-08-202-1/+4
|
* Merge branch 'jv-fix-compile-gdk' into 'master'Douwe Maan2019-08-201-1/+1
|\ | | | | | | | | | | | | Fix bin/compile in GDK Closes gitlab-development-kit#585 See merge request gitlab-org/gitlab-shell!327
| * Fix bin/compile in GDKJacob Vosmaer2019-08-201-1/+1
|/
* Merge branch 'release-9-4-0' into 'master'v9.4.0Ash McKenzie2019-08-202-1/+13
|\ | | | | | | | | Release v9.4.0 See merge request gitlab-org/gitlab-shell!325
| * Release v9.4.0release-9-4-0Patrick Bajao2019-08-192-1/+13
|/
* Merge branch 'jv-go-mod' into 'master'Ash McKenzie2019-08-19751-339235/+152
|\ | | | | | | | | Use go mod See merge request gitlab-org/gitlab-shell!323
| * Use go modJacob Vosmaer2019-08-19751-339235/+152
|/
View Lorry Controller Status