summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-052-2/+6
|
* Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-047-12/+95
|\ | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475
| * Fixed bugsh-optimize-groups-apiFrancisco Lopez2017-12-041-0/+7
| |
| * Moving query to base count serviceFrancisco Lopez2017-12-043-8/+4
| |
| * Using map to retrieve the element ids because of some issues with mysqlFrancisco Lopez2017-12-013-4/+9
| |
| * Undoing the change to ForkNetworkMemberFrancisco Lopez2017-12-011-1/+4
| |
| * Comments from code review applied. Also switched forked_from_project and ↵Francisco Lopez2017-12-016-28/+26
| | | | | | | | ForkedProjectLinks to ForkNetworkMember
| * Code review comments appliedFrancisco Lopez2017-12-012-2/+10
| |
| * More preloading improvement and added batch count servicesFrancisco Lopez2017-12-015-2/+68
| |
* | Fix watch level for mentions in descriptionSean McGivern2017-12-041-1/+12
|/ | | | | | | | | | | | | | | For a user with the mention notification level set, the type of their corresponding NotificationRecipient must be :mention for them to receive an email. We set this correctly on notes, but we weren't adding it on new issues or MRs - perhaps because these users are also participants. But the type of the NotificationRecipient in that case would be :participant, not mention, so we have to add the mentioned users manually when creating an issue or MR. When editing an issue or MR, and there are newly-mentioned users to email, we still use the :new_issue and :new_merge_request actions, so this works for that case as well.
* Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master'Kamil Trzciński2017-12-011-43/+12
|\ | | | | | | | | | | | | Extract class responsible for building a pipeline Closes #38460 See merge request gitlab-org/gitlab-ce!14762
| * Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-classGrzegorz Bizon2017-11-3074-617/+1236
| |\ | | | | | | | | | * master: (1794 commits)
| * | Extract class responsible for building a pipelineGrzegorz Bizon2017-10-091-43/+12
| | |
* | | allow caching options to be specified for counting servicesBrett Walker2017-11-301-1/+7
| |/ |/|
* | Merge branch ↵Sean McGivern2017-11-292-32/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884
| * | Add an ability to use a custom branch name on creation from issuesVitaliy @blackst0ne Klachkov2017-11-252-32/+58
| | |
* | | Merge branch ↵Kamil Trzciński2017-11-281-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380
| * | | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-1/+9
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
* | | | Merge branch ↵Rémy Coutable2017-11-282-9/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591
| * | | | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-282-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
* | | | | 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
View Lorry Controller Status