summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-175-2/+130
|\
| * Tracking of custom eventscustom-events-trackingYorick Peterse2016-08-175-2/+130
* | Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1711-45/+288
|\ \
| * | Better formatting for downtime check messagesfix-downtime-check-formattingYorick Peterse2016-08-171-1/+23
| * | Fixed downtime check label colouringYorick Peterse2016-08-171-2/+2
| |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-166-38/+223
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-164-2/+221
| | * Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-1/+2
| | |\
| | | * Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-151-1/+2
| | | |\
| | | | * Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-111-1/+2
| | * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-35/+0
| | |\ \ \
| | | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-24/+0
| | | * | | Refactored spam related code even furtherPatricio Cano2016-08-151-11/+0
| | | |/ /
| * | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-157-56/+314
| |\ \ \ \ | | |/ / /
| * | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-0/+99
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-8/+39
| |\ \ \ \
| * | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-124-4/+4
| * | | | | Prefer described_class, feedback:Lin Jen-Shin2016-08-123-3/+3
| * | | | | Enhance a pipeline event tests to analyse number of returned buildsKamil Trzcinski2016-08-111-2/+6
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-114-13/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1137-218/+504
| |\ \ \ \ \ \
| * | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-043-5/+5
| * | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-021-0/+32
* | | | | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-158-56/+413
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-151-3/+3
| * | | | | | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-151-0/+12
| * | | | | | | Add template class for coverage report badgeGrzegorz Bizon2016-08-151-0/+130
| * | | | | | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-152-0/+12
| * | | | | | | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-0/+24
| * | | | | | | Extract common badge metadata test examplesGrzegorz Bizon2016-08-152-19/+23
| * | | | | | | Implement the main class of test coverage badgeGrzegorz Bizon2016-08-151-8/+68
| * | | | | | | Refactor badge template and metadata classesGrzegorz Bizon2016-08-153-44/+39
| * | | | | | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-152-4/+6
| * | | | | | | Add empty test coverage badge class and specsGrzegorz Bizon2016-08-151-0/+19
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Change the order of the access rules to check simpler first, and add specschange-access-updateAlejandro Rodríguez2016-08-121-0/+99
| | |_|_|/ / | |/| | | |
* | | | | | Find match line headers by backtrackingSean McGivern2016-08-121-0/+104
* | | | | | Add more tests for conflictsSean McGivern2016-08-122-5/+5
* | | | | | Clarify Conflict::File#sections methodSean McGivern2016-08-121-11/+12
* | | | | | Add blob_icon to conflict file JSONSean McGivern2016-08-121-0/+4
* | | | | | Add blob_path to conflict file JSONSean McGivern2016-08-121-1/+9
* | | | | | Use same resolution format on FE and BESean McGivern2016-08-121-2/+2
* | | | | | Fix specsSean McGivern2016-08-121-3/+2
* | | | | | Raise errors for large and binary filesSean McGivern2016-08-121-9/+17
* | | | | | Auto-highlight conflict when rich_text is calledSean McGivern2016-08-121-5/+11
* | | | | | Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+66
* | | | | | Handle multiple merge conflict files in collectionSean McGivern2016-08-123-12/+35
* | | | | | Add backend for merge conflicts readingSean McGivern2016-08-122-0/+254
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-121-0/+30
|\ \ \ \ \
| * | | | | api for generating new merge requestScott Le2016-08-111-0/+30
| | |_|/ / | |/| | |
* | | | | Fix test failures, that did occur because of missing previously used `reload_...Kamil Trzcinski2016-08-111-7/+9