summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1677-361/+1831
|\
| * Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-1623-69/+227
| |\
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-1624-137/+745
| | |\
| | * | Revert unrelevant changespipeline-hooks-without-slackKamil Trzcinski2016-08-162-20/+15
| | * | Make rubocop happyKamil Trzcinski2016-08-151-9/+9
| | * | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1512-84/+436
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1519-75/+427
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-136-24/+114
| | |\ \ \ \
| | * | | | | Make explicit call for all event types for ProjectHook factoryKamil Trzcinski2016-08-121-9/+7
| | * | | | | Rename queue to enqueue in testsKamil Trzcinski2016-08-121-6/+6
| | * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-6/+23
| | |\ \ \ \ \
| | * | | | | | Fix test failuresKamil Trzcinski2016-08-121-1/+1
| | * | | | | | Make pipeline to be in created state for hooks testsKamil Trzcinski2016-08-121-1/+1
| | * | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1210-115/+235
| | |\ \ \ \ \ \
| | * | | | | | | Have trait all_events_enabled so that's easier to reuse, feedback:Lin Jen-Shin2016-08-122-4/+15
| | * | | | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-1218-39/+31
| | * | | | | | | Make it more grammatically correct, feedback:Lin Jen-Shin2016-08-121-4/+4
| | * | | | | | | if -> when; when -> `when`; %w() -> %w[]; and fix some typos:Lin Jen-Shin2016-08-121-17/+17
| | * | | | | | | Prefer described_class, feedback:Lin Jen-Shin2016-08-123-3/+3
| | * | | | | | | Make the comment more clear, feedback:Lin Jen-Shin2016-08-121-1/+3
| | * | | | | | | Fix tests for pipeline eventsKamil Trzcinski2016-08-111-17/+47
| | * | | | | | | Fix pipeline status change from pending to runningKamil Trzcinski2016-08-111-0/+45
| | * | | | | | | Enhance a pipeline event tests to analyse number of returned buildsKamil Trzcinski2016-08-112-22/+25
| | * | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1137-1085/+1481
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-11248-1996/+3147
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Let's make sure cache were cleared:Lin Jen-Shin2016-08-051-0/+4
| | * | | | | | | | | Define utility functions later, feedback:Lin Jen-Shin2016-08-051-10/+10
| | * | | | | | | | | Removed the abstract let, feedback:Lin Jen-Shin2016-08-051-1/+0
| | * | | | | | | | | Missed renaming themLin Jen-Shin2016-08-051-5/+7
| | * | | | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-0416-26/+54
| | * | | | | | | | | If we use Rails magic it's breaking this test:Lin Jen-Shin2016-08-041-1/+1
| | * | | | | | | | | I was too used to this style...Lin Jen-Shin2016-08-041-1/+1
| | * | | | | | | | | Test against the status in the payloadLin Jen-Shin2016-08-031-1/+9
| | * | | | | | | | | Make sure we only fire hooks upon status changedLin Jen-Shin2016-08-031-1/+21
| | * | | | | | | | | Use when instead of if, feedback:Lin Jen-Shin2016-08-031-4/+4
| | * | | | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-024-6/+72
| * | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-162-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Highlight empty linesPhil Hughes2016-07-202-3/+3
| * | | | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-167-33/+392
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-167-33/+392
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-164-198/+66
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-163-39/+66
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-152-1/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-112-1/+6
| | | * | | | | | | | | | | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-151-38/+60
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-111-38/+60
| | | | |/ / / / / / / / / /
| | * | | | | | | | | | | | Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-lin...Rubén Dávila Santos2016-08-161-159/+0
| * | | | | | | | | | | | | Backport EE assertions in protected branch related specs.Timothy Andrew2016-08-162-10/+10
| * | | | | | | | | | | | | Fix API::BranchesSpec.Timothy Andrew2016-08-161-1/+1
| * | | | | | | | | | | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-162-4/+4