summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix rspec deprecation warningsfix-rspec-warningsJacob Vosmaer2018-12-201-9/+15
|
* Bump version to 8.4.4v8.4.4Douwe Maan2018-12-142-1/+4
|
* Merge branch 'handle-push-options' into 'master'Douwe Maan2018-12-147-8/+52
|\ | | | | | | | | Handle push options See merge request gitlab-org/gitlab-shell!166
| * Disable rubocop for old (<2.2) hash syntaxJonathon Reinhart2018-12-131-1/+1
| | | | | | | | See the discussion on gitlab-org/gitlab-shell!166
| * Use `module_fuction` instead of `extend self`Jonathon Reinhart2018-12-131-1/+1
| | | | | | | | https://github.com/rubocop-hq/ruby-style-guide#module-function
| * Use 'push_options' everywhere instead of 'push_opts'Jonathon Reinhart2018-12-135-12/+12
| |
| * Pass push options to GitLab /internal/post_receive APIJonathon Reinhart2018-12-135-8/+15
| | | | | | | | | | | | | | | | | | | | push_opts[] is named as such so that it becomes an array in the GitLab internal Grape::API params hash. If it were named push_opts, only the final (scalar) push_opts parameter would be present. Also update specs to include push_opts parameter: - gitlab_post_receive_spec - gitlab_net_spec for the internal API change
| * Add lib/hooks_utils.rbJonathon Reinhart2018-12-132-0/+37
|/ | | | | | | This module is responsible for converting the GIT_PUSH_OPTION_* environment variables into an array. See https://gitlab.com/gitlab-org/gitlab-ce/issues/18667
* Merge branch 'remove-unused-names-helper' into 'master'Robert Speicher2018-12-134-22/+0
|\ | | | | | | | | Remove unused lib/names_helper.rb See merge request gitlab-org/gitlab-shell!173
| * Remove unused lib/names_helper.rbJonathon Reinhart2018-12-134-22/+0
| | | | | | | | As of 7eb45672b7, NamesHelper is no longer used.
* | Revert "Merge branch 'sh-bump-ruby-version' into 'master'"Douwe Maan2018-12-1320-132/+87
| | | | | | This reverts merge request !257
* | Merge branch 'sh-bump-ruby-version' into 'master'Douwe Maan2018-12-1320-87/+132
|\ \ | |/ |/| | | | | Upgrade to Ruby 2.5.3 See merge request gitlab-org/gitlab-shell!257
| * Upgrade to Ruby 2.5.3Stan Hu2018-12-1320-87/+132
|/
* Merge branch 'vendor-update' into 'master'Douwe Maan2018-12-11373-33426/+81807
|\ | | | | | | | | Vendor updates See merge request gitlab-org/gitlab-shell!264
| * Vendor updatesAndrew Newdigate2018-12-11373-33426/+81807
|/
* Merge branch 'revert-0662bdd1' into 'master'Nick Thomas2018-12-0741-2530/+2243
|\ | | | | | | | | Revert "Merge branch 'zj-rename-gitalypb' into 'master'" See merge request gitlab-org/gitlab-shell!263
| * Revert "Merge branch 'zj-rename-gitalypb' into 'master'"revert-0662bdd1Zeger-Jan van de Weg2018-12-0741-2530/+2243
|/ | | This reverts merge request !262
* Merge branch 'zj-rename-gitalypb' into 'master'Nick Thomas2018-12-0641-2243/+2530
|\ | | | | | | | | Upgrade gitaly Client dependency See merge request gitlab-org/gitlab-shell!262
| * Upgrade gitaly Client dependencyZeger-Jan van de Weg2018-12-0641-2243/+2530
|/ | | | | The client now has TLS support. So this gets pulled into this component. To make it work, we have to upgrade the proto too.
* Merge branch 'sh-release-8-4-3' into 'master'v8.4.3Robert Speicher2018-11-282-1/+4
|\ | | | | | | | | Release v8.4.3 See merge request gitlab-org/gitlab-shell!259
| * Release v8.4.3sh-release-8-4-3Stan Hu2018-11-282-1/+4
|/
* Merge branch 'sh-fix-circular-dependency-errors' into 'master'Robert Speicher2018-11-283-3/+5
|\ | | | | | | | | | | | | Remove circular dependency between HTTPHelper and GitlabNet Closes #169 See merge request gitlab-org/gitlab-shell!258
| * Remove circular dependency between HTTPHelper and GitlabNetsh-fix-circular-dependency-errorsStan Hu2018-11-273-3/+5
|/ | | | | | | | | HttpHelper depended on exceptions defined in GitLabNet, but GitLabNet included HttpHelper. Specs in Ruby 2.5 were breaking as a result of Action::Custom not able to reference constants in GitLabNet: https://gitlab.com/gitlab-org/gitlab-shell/-/jobs/126362702. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/169
* Merge branch 'release-8-4-2' into 'master'v8.4.2Nick Thomas2018-11-082-1/+4
|\ | | | | | | | | Release v8.4.2 See merge request gitlab-org/gitlab-shell!255
| * Release v8.4.2Nick Thomas2018-11-082-1/+4
|/
* Merge branch 'ashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug' into 'master'Nick Thomas2018-11-085-26/+82
|\ | | | | | | | | Include LFS operation when requesting auth See merge request gitlab-org/gitlab-shell!254
| * Include LFS operation when making auth requestashmckenzie/8114-geo-push-ssh-lfs-http-auth-bugAsh McKenzie2018-11-085-26/+82
|/ | | | Operation is either upload or download
* Release v8.4.1v8.4.1Douwe Maan2018-10-252-1/+4
|
* Merge branch 'add-http-gateway-time-out-handling' into 'master'Douwe Maan2018-10-251-1/+1
|\ | | | | | | | | Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNet See merge request gitlab-org/gitlab-shell!251
| * Changes the HTTP error code from Gateway timeout to Service Unavailableadd-http-gateway-time-out-handlingTiago Botelho2018-10-241-1/+1
| |
| * Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNetTiago Botelho2018-10-241-1/+1
|/
* Release v8.4.0v8.4.0Sean McGivern2018-10-101-1/+1
|
* Merge branch 'gitaly-auth-v2' into 'master'Sean McGivern2018-10-1027-6/+1957
|\ | | | | | | | | | | | | Use Gitaly's v2 auth scheme Closes gitaly#1319 See merge request gitlab-org/gitlab-shell!250
| * Use Gitaly's v2 auth schemegitaly-auth-v2Alejandro Rodríguez2018-10-0927-6/+1957
|/
* Merge branch 'readme-overview' into 'master'Douwe Maan2018-10-011-29/+19
|\ | | | | | | | | Update overview in readme See merge request gitlab-org/gitlab-shell!248
| * Update overview in readmeJacob Vosmaer2018-10-011-29/+19
|/
* Merge branch 'gitlab-shell-no-glid-argument' into 'master'Nick Thomas2018-10-012-22/+1
|\ | | | | | | | | | | | | Remove mistaken support for `gitlab-shell user-123` Closes #151 See merge request gitlab-org/gitlab-shell!247
| * Remove mistaken support for `gitlab-shell user-123`gitlab-shell-no-glid-argumentJacob Vosmaer2018-09-282-22/+1
| |
* | Merge branch '74-go-go-go-go-go' into 'master'Douwe Maan2018-09-287-19/+130
|\ \ | |/ |/| | | | | | | | | Feature flag for go/ruby gitlab-shell implementations Closes #74 See merge request gitlab-org/gitlab-shell!233
| * Allow the config directory to be specifiedNick Thomas2018-09-283-17/+31
| |
| * Specify a richer scheme to run the migration withNick Thomas2018-09-284-28/+60
| |
| * Run the Ruby specs in the "go:x.y" tests as wellNick Thomas2018-09-281-7/+25
| | | | | | | | | | | | Since the Go code now wraps the Ruby script, this makes sense and tests the interaction of the two codebases. Over time, the number of Ruby tests to run will approach 0.
| * Initial feature-flagged go/ruby switchNick Thomas2018-09-286-6/+53
|/
* Merge branch 'ash.mckenzie/display-feedback-v2' into 'master'Nick Thomas2018-09-259-88/+78
|\ | | | | | | | | Display helpful feedback when proxying an SSH git push to secondary request (v2) See merge request gitlab-org/gitlab-shell!246
| * Display helpful feedback when proxying an SSH git push to secondary request ↵Ash McKenzie2018-09-259-88/+78
|/ | | | (v2)
* Merge branch '155-merge-8-3-3-into-master' into 'master'Stan Hu2018-09-142-1/+4
|\ | | | | | | | | | | | | Merge 8-3-stable branch changes into master Closes #155 See merge request gitlab-org/gitlab-shell!245
| * Release v8.3.3v8.3.38-3-stableNick Thomas2018-09-142-1/+4
| |
* | Merge branch 'ash.mckenzie/display-feedback' into 'master'Stan Hu2018-09-135-25/+162
|\ \ | |/ |/| | | | | Display helpful feedback when proxying an SSH git push to secondary request See merge request gitlab-org/gitlab-shell!244
| * primary_repo can be a String or a Hashash.mckenzie/display-feedbackAsh McKenzie2018-09-131-34/+44
| |
| * Print message to $stderr for custom actionAsh McKenzie2018-09-133-0/+111
| |
View Lorry Controller Status