summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7Rémy Coutable2018-07-111-4/+6
* Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-091-1/+1
* Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-091-1/+1
* Refactor rspec matchers in read_only_spec.rbBrett Walker2018-07-071-0/+1
* Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-064-12/+66
|\
| * fix permissionsJames Lopez2018-07-061-1/+2
| * Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-064-12/+65
* | Ability to check if underlying database is read onlyBrett Walker2018-07-061-0/+15
* | Merge branch 'gitaly-set-delete-config' into 'master'Nick Thomas2018-07-062-6/+55
|\ \
| * | Add Repository#set_config and #delete_configJacob Vosmaer2018-07-062-6/+55
* | | Merge branch 'build-chunks-on-object-storage' into 'master'Grzegorz Bizon2018-07-061-0/+29
|\ \ \
| * \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-0622-107/+171
| |\ \ \
| * \ \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-045-307/+52
| |\ \ \ \
| * | | | | Add spec for ExclusiveLeaseHelpersShinya Maeda2018-07-031-0/+29
* | | | | | Merge branch 'gitaly-conflicts-find-commit' into 'master'Douwe Maan2018-07-062-77/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-062-77/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-061-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-021-0/+5
* | | | | Merge branch 'jprovazn-label-links-update' into 'master'Sean McGivern2018-07-061-0/+138
|\ \ \ \ \
| * | | | | Fixed pluck and renamed methodsJan Provaznik2018-07-051-7/+8
| * | | | | Restrict group scopeJan Provaznik2018-07-051-1/+1
| * | | | | Added tests for MRsJan Provaznik2018-07-051-1/+1
| * | | | | Fixed sql string splitsJan Provaznik2018-07-041-7/+6
| * | | | | Migration which fixes cross-project label referencesJan Provaznik2018-07-031-0/+138
* | | | | | Merge branch 'remove-trace-efficiently' into 'master'Kamil Trzciński2018-07-061-8/+11
|\ \ \ \ \ \
| * | | | | | Revice the changelogShinya Maeda2018-07-061-1/+0
| * | | | | | Merge branch 'master' into remove-trace-efficientlyShinya Maeda2018-07-0622-107/+171
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Invalidate memoization after its erasedShinya Maeda2018-07-041-0/+2
| * | | | | | Simplify the commentsShinya Maeda2018-07-041-5/+2
| * | | | | | Remove traces efficientlyShinya Maeda2018-07-041-8/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Use AlreadyArchivedError if it's the caseShinya Maeda2018-07-061-3/+3
* | | | | | Merge branch 'master' into fix-trace-archive-cron-worker-race-conditionShinya Maeda2018-07-0614-58/+146
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'revert-8678cf9b' into 'master'Grzegorz Bizon2018-07-053-8/+94
| |\ \ \ \ \
| | * | | | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-053-8/+94
| * | | | | | Updated Gitaly timeout valuesAndrew Newdigate2018-07-059-49/+50
| |/ / / / /
| * | | | | Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-051-0/+1
| |\ \ \ \ \
| | * | | | | Render LegacyDiffNote when diff_file blob is nilFelipe Artur2018-07-041-0/+1
| * | | | | | Clean up Gitaly N+1 stack tracesSean McGivern2018-07-041-1/+1
* | | | | | | Prevent WRITE opetaions if it's already archivedShinya Maeda2018-07-051-1/+4
* | | | | | | Fix specShinya Maeda2018-07-051-1/+1
* | | | | | | Check if trace exists before process `archive!` methodShinya Maeda2018-07-051-1/+1
|/ / / / / /
* | | | | | Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master'Sean McGivern2018-07-044-43/+10
|\ \ \ \ \ \
| * | | | | | Remove more feature flagsJacob Vosmaer2018-07-034-43/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master'Grzegorz Bizon2018-07-041-1/+1
|\ \ \ \ \ \
| * | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-261-1/+1
* | | | | | | Merge branch 'jprovazn-fix-mr-caching' into 'master'Sean McGivern2018-07-042-6/+4
|\ \ \ \ \ \ \
| * | | | | | | Use serialize_keys as part of highlight diff cacheJan Provaznik2018-07-042-6/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jprovazn-direct-upload' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Updated multipart to support workhorse direct uploadsJan Provaznik2018-06-271-7/+9
* | | | | | | | Merge branch 'bvl-graphql-pipeline-lists' into 'master'Douwe Maan2018-07-044-0/+95
|\ \ \ \ \ \ \ \