summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable Sidekiq when importing a GitLab project from a filesh-fix-issue-48836Stan Hu2018-07-071-15/+13
| | | | | | | | The actual import can take over 40 seconds to run, which can cause request timeouts. This should be done inside gitlab-qa, where Sidekiq is actually running. Closes #48836
* Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵Sean McGivern2018-07-0631-46/+509
|\ | | | | | | | | | | | | | | | | 'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
| * fix specJames Lopez2018-07-061-1/+0
| |
| * fix permissionsJames Lopez2018-07-061-1/+2
| |
| * Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-0631-45/+508
| |
* | Merge branch 'docs-update-eks-hostname' into 'master'Achilleas Pipinellis2018-07-061-1/+1
|\ \ | | | | | | | | | | | | remove extra tick for eks docs See merge request gitlab-org/gitlab-ce!20453
| * | remove extra tick for eks docsdanielgruesso2018-07-061-1/+1
| | |
* | | Merge branch 'bw-enable-commonmark-preview' into 'master'Sean McGivern2018-07-0634-35/+248
|\ \ \ | |/ / |/| | | | | | | | Use proper markdown rendering for previews See merge request gitlab-org/gitlab-ce!19672
| * | Use proper markdown rendering for previewsBrett Walker2018-07-0634-35/+248
|/ /
* | Merge branch 'jlh-gpl-commitment' into 'master'Jacob Schatz2018-07-061-1/+21
|\ \ | | | | | | | | | | | | Add GPL Commitment language See merge request gitlab-org/gitlab-ce!20449
| * | Add GPL Commitment languageJamie Hurewitz2018-07-061-1/+21
| | |
* | | Merge branch 'sh-guard-repository-checks' into 'master'Robert Speicher2018-07-064-4/+45
|\ \ \ | | | | | | | | | | | | | | | | Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker} See merge request gitlab-org/gitlab-ce!20441
| * | | Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker}Stan Hu2018-07-064-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw in production that DispatchWorker was running about twice an hour, which would schedule twice as many jobs as it should. For some reason, BatchWorker was running 1000 times per hour, possibly due to Sidekiq RSS kills that caused these jobs to restart. Adding an ExclusiveLease prevents these jobs from running more than they should. Relates to https://gitlab.com/gitlab-com/infrastructure/issues/4526
* | | | Merge branch 'docs-make-sure-enabling-omniauth' into 'master'Achilleas Pipinellis2018-07-062-89/+104
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Make it clear that we need to enable omniauth for SAML and Bitbucket See merge request gitlab-org/gitlab-ce!20421
| * | | Make it clear that we need to enable omniauth for SAML and BitbucketLin Jen-Shin2018-07-062-89/+104
|/ / /
* | | Merge branch 'ce-5448-move-mailers-previews' into 'master'Robert Speicher2018-07-066-4/+4
|\ \ \ | | | | | | | | | | | | | | | | CE: Move mailer preview to app directory See merge request gitlab-org/gitlab-ce!20430
| * | | Disable public_send for our preview mailersLin Jen-Shin2018-07-061-1/+1
| | | |
| * | | Move spec/mailers/previews to app/mailers/previewsLin Jen-Shin2018-07-066-3/+3
| | | |
* | | | Merge branch 'bw-add-database-readonly' into 'master'Robert Speicher2018-07-062-0/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ability to check if underlying database is read only See merge request gitlab-org/gitlab-ce!20345
| * | | | Ability to check if underlying database is read onlyBrett Walker2018-07-062-0/+44
|/ / / /
* | | | Merge branch 'gitaly-dont-use-path' into 'master'Sean McGivern2018-07-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove silly use of repo disk path See merge request gitlab-org/gitlab-ce!20436
| * | | | Remove silly use of repo disk pathJacob Vosmaer2018-07-061-2/+2
| | | | |
* | | | | Merge branch 'gitaly-set-delete-config' into 'master'Nick Thomas2018-07-067-12/+109
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Add Repository#set_config and #delete_config See merge request gitlab-org/gitlab-ce!20372
| * | | | Add Repository#set_config and #delete_configJacob Vosmaer2018-07-067-12/+109
| | | | |
* | | | | Merge branch 'rc-qa-146' into 'master'Grzegorz Bizon2018-07-0618-15/+355
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new scenario to test GitHub import Closes gitlab-qa#146 See merge request gitlab-org/gitlab-ce!19555
| * | | | | [QA] Add a new scenario to test GitHub importRémy Coutable2018-07-0618-19/+337
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | [QA] Add a new Page::Issuable::Show pageRémy Coutable2018-07-062-0/+22
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'jprovazn-delete-upload-worker' into 'master'Sean McGivern2018-07-065-133/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete deprecated object_storage_upload queue See merge request gitlab-org/gitlab-ce!20371
| * | | | | Delete deprecated object_storage_upload queueJan Provaznik2018-07-065-133/+6
|/ / / / /
* | | | | Merge branch 'fl-mr-refactor-performance-improvements' into 'master'Tim Zallmann2018-07-068-55/+90
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves MR refactor getters and state and adds specs Closes #48937 See merge request gitlab-org/gitlab-ce!20429
| * | | | | Exports getters individually.Filipa Lacerda2018-07-068-55/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exports state to allow tests Adds specs for the getters that didn't have any.
* | | | | | Merge branch 'pages-1-0-0' into 'master'Kamil Trzciński2018-07-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages to v1.0.0 See merge request gitlab-org/gitlab-ce!20404
| * | | | | | Update GitLab Pages to v1.0.0Nick Thomas2018-07-061-1/+1
| | | | | | |
* | | | | | | Merge branch ↵Phil Hughes2018-07-067-3/+162
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh-key' into 'master' (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key" Closes #46396 See merge request gitlab-org/gitlab-ce!19997
| * | | | | | | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-067-3/+162
|/ / / / / / /
* | | | | | | Merge branch 'revert-e76b176d' into 'master'Clement Ho2018-07-062-11/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'" See merge request gitlab-org/gitlab-ce!20428
| * | | | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'"Victor Wu2018-07-062-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !19250
* | | | | | | | Merge branch '36234-nav-add-groups-dropdown' into 'master'Phil Hughes2018-07-0649-1706/+1894
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add dropdown to Groups link in top bar" Closes #36234 See merge request gitlab-org/gitlab-ce!18280
| * | | | | | | Resolve "Add dropdown to Groups link in top bar"Dennis Tang2018-07-0649-1706/+1894
|/ / / / / / /
* | | | | | | Merge branch 'bvl-preload-parents-after-pagination' into 'master'Douwe Maan2018-07-064-16/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload ancestors after pagination when filtering Closes #40785 See merge request gitlab-org/gitlab-ce!20398
| * | | | | | Preload ancestors after pagination when filteringBob Van Landuyt2018-07-064-16/+44
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination.
* | | | | | Merge branch ↵Yorick Peterse2018-07-062-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master' [Rails5] Fix milestone GROUP BY query Closes #48428 See merge request gitlab-org/gitlab-ce!20256
| * | | | | [Rails5] Fix milestone GROUP BY queryblackst0ne2018-07-062-1/+7
| | | | | |
* | | | | | Merge branch ↵Douwe Maan2018-07-061-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6653-extract-ee-specific-files-lines-for-discussion-app-services' into 'master' Extract EE-specific lines from NotificationService See merge request gitlab-org/gitlab-ce!20406
| * | | | | Extract EE-specific lines from NotificationServiceSean McGivern2018-07-061-0/+6
| | | | | |
* | | | | | Merge branch 'build-chunks-on-object-storage' into 'master'Grzegorz Bizon2018-07-0615-216/+1077
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515
| * | | | | Add spec for the ordering of the data storesShinya Maeda2018-07-061-0/+16
| | | | | |
| * | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-06541-22742/+41360
| |\ \ \ \ \
| * | | | | | Fix specShinya Maeda2018-07-042-4/+4
| | | | | | |
| * | | | | | Make explicit chunks store classes namespace in factroyShinya Maeda2018-07-041-3/+3
| | | | | | |
View Lorry Controller Status