summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Yorick Peterse2018-07-091-0/+2
|\ | | | | | | | | | | | | | | | | '48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace' into 'master' Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace" Closes #48976 See merge request gitlab-org/gitlab-ce!20462
| * [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass ↵blackst0ne2018-07-071-0/+2
| | | | | | | | of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace'
* | Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Installing Helm Tiller Failing" Closes #48978 See merge request gitlab-org/gitlab-ce!20471
| * | Include wget in apk add commandMayra Cabrera2018-07-081-1/+1
| | | | | | | | | | | | Closes #48978
* | | Make blob and other RPC's mandatoryJacob Vosmaer (GitLab)2018-07-093-140/+18
| | |
* | | Merge branch 'gitaly-mandatory-20180706-jv' into 'master'Douwe Maan2018-07-094-77/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove gitaly_list_commits_by_oid, gitaly_commit_deltas, gitaly_create_repository flags Closes gitaly#593, gitaly#566, and gitaly#670 See merge request gitlab-org/gitlab-ce!20432
| * | | Make more things mandatoryJacob Vosmaer2018-07-064-77/+12
| | | |
* | | | Merge branch 'gitaly-diff-mandatory' into 'master'Grzegorz Bizon2018-07-093-24/+12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Make all Gitaly diff flags mandatory Closes gitaly#528 and gitaly#222 See merge request gitlab-org/gitlab-ce!20424
| * | | Make all Gitaly diff flags mandatoryJacob Vosmaer2018-07-063-24/+12
| | | |
* | | | Refactor rspec matchers in read_only_spec.rbBrett Walker2018-07-071-0/+1
| |_|/ |/| |
* | | Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵Sean McGivern2018-07-064-12/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
| * | | 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_config See merge request gitlab-org/gitlab-ce!20372
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515
| * \ \ 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 revert "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"" See merge request gitlab-org/gitlab-ce!20422
| * | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into ↵Jacob Vosmaer2018-07-062-77/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 'master'"" This partially reverts commit 64dfe2cba1594b67e56233230be8137fa0afacf9.
* | | | | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-061-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled" Closes #48677 See merge request gitlab-org/gitlab-ce!20302
| * | | | If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-021-0/+5
| | | | | | | | | | | | | | | | | | | | it also means we're using omniauth, so we need to set it up.
* | | | | Merge branch 'jprovazn-label-links-update' into 'master'Sean McGivern2018-07-061-0/+138
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project label references Closes #45539 See merge request gitlab-org/gitlab-ce!20308
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant query when removing trace See merge request gitlab-org/gitlab-ce!20324
| * | | | | | 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'" See merge request gitlab-org/gitlab-ce!20402
| | * | | | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-053-8/+94
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !20339
| * | | | | | Updated Gitaly timeout valuesAndrew Newdigate2018-07-059-49/+50
| |/ / / / /
| * | | | | Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-051-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix discussion entity for legacy diff notes Closes #48474 See merge request gitlab-org/gitlab-ce!20214
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to know the details of every library involved in these calls; they will always originate in the GitLab app itself.
* | | | | | | 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 Gitaly feature flags Closes gitaly#329, gitaly#320, gitaly#323, and gitaly#328 See merge request gitlab-org/gitlab-ce!20343
| * | | | | | 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` See merge request gitlab-org/gitlab-ce!20172