Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7 | Rémy Coutable | 2018-07-11 | 1 | -4/+6 |
* | Merge branch 'jprovazn-upload-symlink' into 'master' | Kamil Trzciński | 2018-07-09 | 1 | -1/+1 |
* | Merge branch '48978-fix-helm-installation-on-cluster' into 'master' | Kamil Trzciński | 2018-07-09 | 1 | -1/+1 |
* | Refactor rspec matchers in read_only_spec.rb | Brett Walker | 2018-07-07 | 1 | -0/+1 |
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma... | Sean McGivern | 2018-07-06 | 4 | -12/+66 |
|\ | |||||
| * | fix permissions | James Lopez | 2018-07-06 | 1 | -1/+2 |
| * | Update Import/Export to use object storage (based on aa feature flag) | James Lopez | 2018-07-06 | 4 | -12/+65 |
* | | Ability to check if underlying database is read only | Brett Walker | 2018-07-06 | 1 | -0/+15 |
* | | Merge branch 'gitaly-set-delete-config' into 'master' | Nick Thomas | 2018-07-06 | 2 | -6/+55 |
|\ \ | |||||
| * | | Add Repository#set_config and #delete_config | Jacob Vosmaer | 2018-07-06 | 2 | -6/+55 |
* | | | Merge branch 'build-chunks-on-object-storage' into 'master' | Grzegorz Bizon | 2018-07-06 | 1 | -0/+29 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-06 | 22 | -107/+171 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-04 | 5 | -307/+52 |
| |\ \ \ \ | |||||
| * | | | | | Add spec for ExclusiveLeaseHelpers | Shinya Maeda | 2018-07-03 | 1 | -0/+29 |
* | | | | | | Merge branch 'gitaly-conflicts-find-commit' into 'master' | Douwe Maan | 2018-07-06 | 2 | -77/+6 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma... | Jacob Vosmaer | 2018-07-06 | 2 | -77/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master' | Douwe Maan | 2018-07-06 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | If `omniauth_auto_sign_in_with_provider` is set, | Lin Jen-Shin | 2018-07-02 | 1 | -0/+5 |
* | | | | | Merge branch 'jprovazn-label-links-update' into 'master' | Sean McGivern | 2018-07-06 | 1 | -0/+138 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed pluck and renamed methods | Jan Provaznik | 2018-07-05 | 1 | -7/+8 |
| * | | | | | Restrict group scope | Jan Provaznik | 2018-07-05 | 1 | -1/+1 |
| * | | | | | Added tests for MRs | Jan Provaznik | 2018-07-05 | 1 | -1/+1 |
| * | | | | | Fixed sql string splits | Jan Provaznik | 2018-07-04 | 1 | -7/+6 |
| * | | | | | Migration which fixes cross-project label references | Jan Provaznik | 2018-07-03 | 1 | -0/+138 |
* | | | | | | Merge branch 'remove-trace-efficiently' into 'master' | Kamil Trzciński | 2018-07-06 | 1 | -8/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revice the changelog | Shinya Maeda | 2018-07-06 | 1 | -1/+0 |
| * | | | | | | Merge branch 'master' into remove-trace-efficiently | Shinya Maeda | 2018-07-06 | 22 | -107/+171 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Invalidate memoization after its erased | Shinya Maeda | 2018-07-04 | 1 | -0/+2 |
| * | | | | | | Simplify the comments | Shinya Maeda | 2018-07-04 | 1 | -5/+2 |
| * | | | | | | Remove traces efficiently | Shinya Maeda | 2018-07-04 | 1 | -8/+13 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Use AlreadyArchivedError if it's the case | Shinya Maeda | 2018-07-06 | 1 | -3/+3 |
* | | | | | | Merge branch 'master' into fix-trace-archive-cron-worker-race-condition | Shinya Maeda | 2018-07-06 | 14 | -58/+146 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'revert-8678cf9b' into 'master' | Grzegorz Bizon | 2018-07-05 | 3 | -8/+94 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'" | Jacob Vosmaer (GitLab) | 2018-07-05 | 3 | -8/+94 |
| * | | | | | | Updated Gitaly timeout values | Andrew Newdigate | 2018-07-05 | 9 | -49/+50 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'issue_48474' into 'master' | Sean McGivern | 2018-07-05 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Render LegacyDiffNote when diff_file blob is nil | Felipe Artur | 2018-07-04 | 1 | -0/+1 |
| * | | | | | | Clean up Gitaly N+1 stack traces | Sean McGivern | 2018-07-04 | 1 | -1/+1 |
* | | | | | | | Prevent WRITE opetaions if it's already archived | Shinya Maeda | 2018-07-05 | 1 | -1/+4 |
* | | | | | | | Fix spec | Shinya Maeda | 2018-07-05 | 1 | -1/+1 |
* | | | | | | | Check if trace exists before process `archive!` method | Shinya Maeda | 2018-07-05 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master' | Sean McGivern | 2018-07-04 | 4 | -43/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove more feature flags | Jacob Vosmaer | 2018-07-03 | 4 | -43/+10 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master' | Grzegorz Bizon | 2018-07-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runners | Kamil Trzciński | 2018-06-26 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jprovazn-fix-mr-caching' into 'master' | Sean McGivern | 2018-07-04 | 2 | -6/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use serialize_keys as part of highlight diff cache | Jan Provaznik | 2018-07-04 | 2 | -6/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jprovazn-direct-upload' into 'master' | Kamil Trzciński (OoO till 3th) | 2018-07-04 | 1 | -7/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated multipart to support workhorse direct uploads | Jan Provaznik | 2018-06-27 | 1 | -7/+9 |
* | | | | | | | | Merge branch 'bvl-graphql-pipeline-lists' into 'master' | Douwe Maan | 2018-07-04 | 4 | -0/+95 |
|\ \ \ \ \ \ \ \ |