summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-283-54/+132
|\ | | | | | | | | Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
| * Changes to Attachments Migration for EE and Geo compatibilityGabriel Mazetto2017-11-281-5/+12
| |
| * Backport EE changes to make test possible when prepending modulesGabriel Mazetto2017-11-242-0/+8
| |
| * Codestyle changes and Added Exclusive Lease to hashed storage migrationGabriel Mazetto2017-11-231-1/+1
| |
| * when rollingback repository migration, toggle readonly mode backGabriel Mazetto2017-11-232-3/+3
| |
| * Raises error when migration cannot happen so job is cancelledGabriel Mazetto2017-11-231-1/+3
| |
| * attachments migration should move only the base folderGabriel Mazetto2017-11-231-25/+12
| |
| * WIP Attachments migrationGabriel Mazetto2017-11-232-1/+60
| |
| * Refactor Hashed Storage migration to add additional migration stepsGabriel Mazetto2017-11-232-57/+72
| |
* | Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into ↵Douwe Maan2017-11-285-28/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor the way we pass `old associations` to issuable's update services Closes #40226 See merge request gitlab-org/gitlab-ce!15542
| * | Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-245-28/+33
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-251-0/+9
|/ /
* | Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-243-22/+16
|\ \ | | | | | | | | | | | | | | | | | | Fix WIP system note not being created Closes #40374 See merge request gitlab-org/gitlab-ce!15528
| * | Fix WIP system note not being createdissue_40374Felipe Artur2017-11-233-22/+16
| |/
* | Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-231-14/+6
|\ \ | | | | | | | | | | | | Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424
| * | Rename fetch_refs to refmapDouwe Maan2017-11-231-3/+3
| | |
| * | Clean up repository fetch and mirror methodsDouwe Maan2017-11-231-14/+6
| |/
* | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'Rémy Coutable2017-11-232-4/+4
|\ \ | | | | | | | | | | | | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService See merge request gitlab-org/gitlab-ce!15575
| * | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-serviceJames Edwards-Jones2017-11-232-4/+4
| |/
* | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
| * | Use latest_merge_request_diff associationSean McGivern2017-11-231-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
* | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-1/+1
|/
* Merge branch ↵Sean McGivern2017-11-211-0/+4
|\ | | | | | | | | | | | | | | | | '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080
| * reverting to the simpler approachmicael.bergeron2017-11-161-0/+4
| |
* | Merge branch 'issue_40337' into 'master'Sean McGivern2017-11-211-9/+14
|\ \ | | | | | | | | | | | | | | | | | | Fix promoting milestone updating all issuables without milestone Closes #40337 See merge request gitlab-org/gitlab-ce!15487
| * | Fix promoting milestone updating all issuables without milestoneissue_40337Felipe Artur2017-11-211-9/+14
| | |
* | | Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-201-0/+12
|\ \ \ | |/ / |/| | | | | | | | Add logs for monitoring the merge process See merge request gitlab-org/gitlab-ce!15425
| * | Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| | |
| * | Add logs for monitoring the merge processosw-merge-process-logsOswaldo Ferreira2017-11-161-0/+12
| | |
* | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-205-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-165-0/+5
| | | | | | | | | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | | | Fix project transfer with hashed-storage attachmentsNick Thomas2017-11-171-1/+11
| | | |
* | | | Fix hashed storage with project transfers to another namespacesh-port-hashed-storage-transfer-fixStan Hu2017-11-161-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With hashed storage enabled, we would fail to transfer a project to another namespace because the provided paths were wrong. Instead, we should not attempt to move paths at all. Closes gitlab-org/gitlab-ee#4056
* | | | Merge branch 'cache-user-keys-count' into 'master'Douwe Maan2017-11-166-27/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache the number of user SSH keys See merge request gitlab-org/gitlab-ce!15401
| * | | | Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-166-27/+65
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By caching the number of personal SSH keys we reduce the number of queries necessary on pages such as ProjectsController#show (which can end up querying this data multiple times). The cache is refreshed/flushed whenever an SSH key is added, removed, or when a user is removed.
* | | | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-153-9/+15
| |_|/ |/| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-151-11/+11
|\ \ \ | |/ / |/| | | | | | | | Prefer polymorphism over specific type checks in Import service See merge request gitlab-org/gitlab-ce!15397
| * | Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-151-11/+11
| | |
* | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-131-3/+5
|/ /
* | Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-112-1/+9
| |
* | Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-11/+16
|/
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-11/+1
|\ | | | | | | | | | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253
| * Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-idDouwe Maan2017-11-081-11/+1
| | | | | | | | all the indexes available to us
* | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-1/+17
|\ \ | | | | | | | | | | | | | | | | | | Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731
| * | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-071-4/+4
| | |
| * | Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this MR there were two GitHub related importers: * Github::Import: the main importer used for GitHub projects * Gitlab::GithubImport: importer that's somewhat confusingly used for importing Gitea projects (apparently they have a compatible API) This MR renames the Gitea importer to Gitlab::LegacyGithubImport and introduces a new GitHub importer in the Gitlab::GithubImport namespace. This new GitHub importer uses Sidekiq for importing multiple resources in parallel, though it also has the ability to import data sequentially should this be necessary. The new code is spread across the following directories: * lib/gitlab/github_import: this directory contains most of the importer code such as the classes used for importing resources. * app/workers/gitlab/github_import: this directory contains the Sidekiq workers, most of which simply use the code from the directory above. * app/workers/concerns/gitlab/github_import: this directory provides a few modules that are included in every GitHub importer worker. == Stages The import work is divided into separate stages, with each stage importing a specific set of data. Stages will schedule the work that needs to be performed, followed by scheduling a job for the "AdvanceStageWorker" worker. This worker will periodically check if all work is completed and schedule the next stage if this is the case. If work is not yet completed this worker will reschedule itself. Using this approach we don't have to block threads by calling `sleep()`, as doing so for large projects could block the thread from doing any work for many hours. == Retrying Work Workers will reschedule themselves whenever necessary. For example, hitting the GitHub API's rate limit will result in jobs rescheduling themselves. These jobs are not processed until the rate limit has been reset. == User Lookups Part of the importing process involves looking up user details in the GitHub API so we can map them to GitLab users. The old importer used an in-memory cache, but this obviously doesn't work when the work is spread across different threads. The new importer uses a Redis cache and makes sure we only perform API/database calls if absolutely necessary. Frequently used keys are refreshed, and lookup misses are also cached; removing the need for performing API/database calls if we know we don't have the data we're looking for. == Performance & Models The new importer in various places uses raw INSERT statements (as generated by `Gitlab::Database.bulk_insert`) instead of using Rails models. This allows us to bypass any validations and callbacks, drastically reducing the number of SQL queries and Gitaly RPC calls necessary to import projects. To ensure the code produces valid data the corresponding tests check if the produced rows are valid according to the model validation rules.
* | | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
| * | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-081-0/+39
|\ \ | |/
| * Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-071-0/+39
| |\ | | | | | | | | | | | | | | | | | | Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724