summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Better formatting for downtime check messagesfix-downtime-check-formattingYorick Peterse2016-08-171-2/+13
* 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-1611-82/+231
|\
| * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-168-27/+226
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-168-27/+226
| * | 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
| * | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-161-2/+2
| |/ / /
| * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-47/+0
| |\ \ \
| | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-81/+0
| | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+4
| | * | | Refactored spam related code even furtherPatricio Cano2016-08-151-6/+2
| | * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-151-0/+34
| | |/ /
* | | | 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-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
* | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-124-23/+48
|\ \ \ | |/ /
| * | api for generating new merge requestScott Le2016-08-114-23/+48
* | | 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-114-591/+1
|\ \ \ | |/ /
| * | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-113-590/+0
| |\ \
| | * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-0969-385/+1358
| | |\ \
| | * | | Remove obsolete codeJacob Vosmaer2016-07-223-590/+0
| * | | | Merge branch 'fix-gitaccess-scope' into 'master' Rémy Coutable2016-08-111-1/+1
| |\ \ \ \
| | * | | | Fixing scope issue in GitAccess.Elliot Wiltshire2016-07-251-1/+1
* | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1132-181/+473
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'feature/svg-badge-template' into 'master' Douwe Maan2016-08-103-28/+111
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-099-12/+15
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Improve indentation in svg badge templateGrzegorz Bizon2016-08-081-1/+1
| | * | | | Improve builds badge specs, remove legacy methodsGrzegorz Bizon2016-08-081-15/+6
| | * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0855-371/+1210
| | |\ \ \ \
| | * | | | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-0/+4
| | * | | | | Add badge template class to use with SVG ERB templateGrzegorz Bizon2016-07-281-0/+63
| | * | | | | Calculate build status only in build badge classGrzegorz Bizon2016-07-281-7/+13
| | * | | | | Extract build status badge metadata to separate classGrzegorz Bizon2016-07-282-21/+40
View Lorry Controller Status