summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-backport-missing-parameter' into '5-3-stable'5-3-stableStan Hu2017-08-091-1/+1
|\ | | | | | | | | Add the missing 5th parameter to `GitAccessStatus.new` in `GitlabNet` See merge request !162
| * Add the missing 5th parameter to `GitAccessStatus.new` in `GitlabNet`Robert Speicher2017-08-091-1/+1
|/
* Bump version to 5.3.2v5.3.2Stan Hu2017-08-071-1/+1
|
* Merge branch 'fix-git-2.14-for-windows' into '5-3-stable'Robert Speicher2017-08-072-5/+22
|\ | | | | | | | | Backport fix for Git 2.14 for Windows to 5-3-stable See merge request !160
| * Backport fix for Git 2.14 for Windows to 5-3-stableStan Hu2017-08-072-5/+22
|/
* Bump version to 5.3.1v5.3.1Sean McGivern2017-07-121-1/+1
|
* Merge branch 'only-parse-mr-urls-on-success' into 'master'Rémy Coutable2017-07-123-7/+29
|\ | | | | | | | | Handle internal API errors when getting merge request URLs See merge request !145
| * Handle internal API errors when getting merge request URLsonly-parse-mr-urls-on-successSean McGivern2017-07-123-7/+29
|/
* Bump version to 5.3.0v5.3.0Stan Hu2017-07-081-1/+1
|
* Merge branch 'gitaly-ssh-changelog' into 'master'Stan Hu2017-07-091-0/+3
|\ | | | | | | | | Update CHANGELOG See merge request !144
| * Update CHANGELOGKim Carlbäcker2017-07-091-0/+3
|/
* Merge branch 'gitaly-124-gitaly-ssh' into 'master'Robert Speicher2017-07-0731-566/+5436
|\ | | | | | | | | Gitaly SSH Client See merge request !139
| * no more single-value mergeKim "BKC" Carlbäcker2017-07-071-3/+1
| |
| * metrics makes no sense because 'exec'Kim "BKC" Carlbäcker2017-07-071-4/+2
| |
| * hashes have .include? not .has?Kim "BKC" Carlbäcker2017-07-071-1/+1
| |
| * tokens!Kim "BKC" Carlbäcker2017-07-073-3/+3
| |
| * refactor Gitaly dialOptsgitaly-124-gitaly-sshKim "BKC" Carlbäcker2017-07-073-18/+15
| |
| * don't make up exitCodesKim "BKC" Carlbäcker2017-07-072-6/+6
| |
| * Go 1.8...Kim "BKC" Carlbäcker2017-07-072-5/+1
| |
| * update gitaly-protoKim "BKC" Carlbäcker2017-07-0712-556/+2377
| |
| * type-oKim "BKC" Carlbäcker2017-07-061-1/+1
| |
| * We need metrics loggingKim "BKC" Carlbäcker2017-07-061-2/+4
| |
| * Update README Go1.7 as minimum requirementKim "BKC" Carlbäcker2017-07-061-1/+1
| |
| * no more attrsKim "BKC" Carlbäcker2017-07-061-1/+1
| |
| * simplify specsKim "BKC" Carlbäcker2017-07-061-2/+2
| |
| * AuthenticationKim "BKC" Carlbäcker2017-07-062-2/+18
| |
| * fix vendorKim "BKC" Carlbäcker2017-07-066-56/+71
| |
| * - Update gitaly vendoringKim "BKC" Carlbäcker2017-07-0325-170/+3197
| | | | | | | | | | - Wire up gitaly-*-pack to Gitaly. Don't pass git-*-pack to go - Disable tests for go1.5 & 1.6
* | Bump version to v5.2.1v5.2.1Stan Hu2017-07-061-1/+1
| |
* | Add CHANGELOG entry for 5.2.1Stan Hu2017-07-061-0/+3
| |
* | Merge branch 'sh-revert-141' into 'master'Stan Hu2017-07-0510-10/+10
|\ \ | | | | | | | | | | | | Revert "Merge branch 'sh-disable-rubygems' into 'master'" See merge request !143
| * | Don't revert CHANGELOG entryStan Hu2017-07-051-0/+3
| | |
| * | Revert "Merge branch 'sh-disable-rubygems' into 'master'"Stan Hu2017-07-0511-13/+10
|/ / | | | | | | | | This reverts commit a18c90128e4d3eeae1233b1bc3c3998afd223c0d, reversing changes made to 0a64624152735766c428d1532e434dd0bf5a9748.
* | Bump version to 5.2.0v5.2.0Stan Hu2017-07-051-1/+1
| |
* | Merge branch 'sh-disable-rubygems' into 'master'Sean McGivern2017-07-0511-10/+13
|\ \ | | | | | | | | | | | | Disable RubyGems to increase performance See merge request !141
| * | Disable Rubygems in hooks toosh-disable-rubygemsStan Hu2017-07-043-3/+3
| | |
| * | Disable RubyGems to increase performanceStan Hu2017-07-038-7/+10
|/ / | | | | | | | | | | By default, RubyGems is enabled, which causes the Ruby interpreter to load 600+ additional files at startup when gitlab-shell is designed not to use any external gems.
* | Bump version to v5.1.1v5.1.1Sean McGivern2017-07-031-1/+1
| |
* | Merge branch 'revert-gl-repository' into 'master'Sean McGivern2017-07-036-21/+47
|\ \ | |/ |/| | | | | | | | | Revert gl-repository changes Closes gitlab-ee#2822 See merge request !142
| * Revert "Merge branch ↵revert-gl-repositoryAlejandro Rodríguez2017-07-036-21/+47
|/ | | | | | | '86-follow-up-from-use-gl_repository-if-present-when-enqueing-sidekiq-postreceive-jobs' into 'master'" This reverts commit fa6343515ba65423e9de4c98c6005facc6059938, reversing changes made to 62af7f6af72728cecb98c5275d8b7aeb3953e564.
* Merge branch 'add-list-key-ids' into 'master'v5.1.0Douwe Maan2017-06-284-3/+62
|\ | | | | | | | | Add list-key-ids command See merge request !140
| * Bump version to v5.1.0add-list-key-idsMichael Kozono2017-06-282-1/+4
| |
| * Ensure rm-key works with only IDMichael Kozono2017-06-281-0/+17
| |
| * Add list-key-ids commandMichael Kozono2017-06-282-2/+41
|/
* Bump version to v5.0.6v5.0.6Sean McGivern2017-06-222-1/+2
|
* Merge branch 'dz-add-codequality' into 'master'Robert Speicher2017-06-212-0/+32
|\ | | | | | | | | Add code quality job to gitlab-ci.yml See merge request !138
| * Add .codeclimate.yml config to the projectDmitriy Zaporozhets2017-06-212-1/+19
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add code quality job to gitlab-ci.ymlDmitriy Zaporozhets2017-06-211-0/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'dz-remove-empty-file' into 'master'Dmitriy Zaporozhets2017-06-211-0/+0
|\ \ | |/ |/| | | | | Remove empty file See merge request !137
| * Remove empty fileDmitriy Zaporozhets2017-06-211-0/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>