summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1633-193/+650
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-1615-109/+267
| |\
| | * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-169-38/+241
| | |\
| | | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-169-38/+241
| | * | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-161-6/+3
| | |\ \ | | | |/
| | | * Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-6/+3
| | | |\
| | | | * Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-151-6/+3
| | | | |\
| | | | | * refactor parse_hash based on feedbackJames Lopez2016-08-111-3/+3
| | | | | * Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-111-6/+3
| | * | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-12/+17
| | * | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-162-4/+6
| | * | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-2/+2
| | |/ / /
| | * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-152-49/+0
| | |\ \ \
| | | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-83/+0
| | | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+4
| | | * | | Refactored spam related code even furtherPatricio Cano2016-08-152-7/+3
| | | * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-152-1/+35
| | | |/ /
| * | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1510-69/+296
| |\ \ \ \ | | |/ / /
| | * | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-151-2/+2
| | * | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-151-0/+8
| | * | | Extract base abstract template for badgesGrzegorz Bizon2016-08-153-35/+51
| | * | | Add template class for coverage report badgeGrzegorz Bizon2016-08-151-0/+69
| | * | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-153-22/+42
| | * | | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-0/+38
| | * | | Implement the main class of test coverage badgeGrzegorz Bizon2016-08-151-1/+30
| | * | | Refactor badge template and metadata classesGrzegorz Bizon2016-08-154-14/+19
| | * | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-157-49/+74
| | * | | Add empty test coverage badge class and specsGrzegorz Bizon2016-08-151-0/+17
| | |/ /
| * | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-153-7/+7
| |\ \ \ | | |/ /
| | * | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-151-5/+3
| | |\ \
| | | * | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-4/+2
| | | * | Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-1/+1
| | * | | Merge branch 'change-access-update' into 'master' Yorick Peterse2016-08-151-1/+1
| | |\ \ \
| | | * | | Change the order of the access rules to check simpler first, and add specschange-access-updateAlejandro Rodríguez2016-08-121-1/+1
| | | |/ /
| | * | | Fix a memory leak caused by Banzai::Filter::SanitizationFilterfix/sanitization-filter-leakAhmad Sherif2016-08-141-1/+3
| | |/ /
| * | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-125-23/+52
| |\ \ \ | | |/ /
| * | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-124-4/+4
| * | | Prefer extend self over module_function, feedback:Lin Jen-Shin2016-08-124-4/+4
| * | | Remove stage parameter from send payloadKamil Trzcinski2016-08-111-5/+1
| * | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1120-840/+303
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1152-354/+618
| |\ \ \ \
| * | | | | We still need to skip loading config_processor if skip_ci?Lin Jen-Shin2016-08-051-1/+1
| * | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-043-6/+12
| * | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-023-2/+72
* | | | | | Fixed specs and fixes based on failing specsDouwe Maan2016-08-163-16/+12
* | | | | | Refactor slash command definitionDouwe Maan2016-08-123-72/+97
* | | | | | Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-131-43/+45
* | | | | | Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-131-38/+73
* | | | | | Make slash commands contextualRémy Coutable2016-08-131-9/+31
* | | | | | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-131-3/+11
View Lorry Controller Status