summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-1611-87/+245
|\
| * Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-4/+4
| * Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-17/+1
| * Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-157-66/+216
| |\
| | * Further refactor and syntax fixes.Patricio Cano2016-08-156-79/+104
| | * Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-155-38/+147
| | * Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-0/+17
| | * Refactored spam related code even furtherPatricio Cano2016-08-154-51/+39
| | * Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-152-15/+9
| | * Lay the ground works to submit information to AkismetPatricio Cano2016-08-152-0/+17
| * | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-152-0/+24
| |\ \ | | |/ | |/|
| | * Prevents accidental overwrites of commits from UIFrank West2016-08-152-0/+24
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-152-2/+14
|\ \ \ | |/ /
| * | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-151-1/+2
| |\ \ | | |/ | |/|
| | * Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-1/+2
| * | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-121-1/+12
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-132-4/+19
|\ \ \ | |/ /
| * | Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-122-4/+19
| |\ \ | | |/ | |/|
| | * Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-112-4/+19
* | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-121-1/+1
|\ \ \ | |/ /
| * | Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-121-1/+1
* | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-5/+55
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-121-0/+52
| |\ \ | | |/
| | * api for generating new merge requestScott Le2016-08-111-0/+52
| * | Use state machine for pipeline event processingKamil Trzcinski2016-08-111-2/+3
| |/
* | Fix tests. We cannot reload unless it's already saved:Lin Jen-Shin2016-08-121-1/+4
* | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-126-15/+46
* | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-119-171/+201
|\ \ | |/
| * Merge branch 'refactor-builds-creation-service' into 'master' Rémy Coutable2016-08-118-168/+198
| |\
| | * Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-118-168/+198
| * | New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-101-2/+3
| |/
* | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-119-9/+64
|\ \ | |/
| * Clean up project destructionclean-up-project-destroyStan Hu2016-08-103-4/+8
| * Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-081-0/+17
| |\
| | * Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-082-14/+17
| | * Create service for enabling deploy keysZ.J. van de Weg2016-08-051-0/+14
| * | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-042-2/+26
| |\ \
| | * | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-042-2/+26
| | |/
| * | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-032-2/+1
| * | Introduce Compare model in the codebase.Paco Guzman2016-08-033-4/+7
| * | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
| * | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-0/+8
| |/
* | Touch it after builds were created, aligning with:Lin Jen-Shin2016-08-051-1/+1
* | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-046-8/+9
* | Revert "We don't have to touch it because builds would touch pipeline anyway"Lin Jen-Shin2016-08-042-0/+11
* | We don't have to touch it because builds would touch pipeline anywayLin Jen-Shin2016-08-032-11/+0
* | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-021-0/+1
|/
* webhooks: include old revision in MR update eventsBen Boeckel2016-08-012-4/+7
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-1/+7
* Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-292-82/+84
|\