summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-0/+5
|\
| * Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+5
* | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-26/+0
|\ \
| * | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-26/+0
| |/
* | Adds response mime type to transaction metric action when it's not HTMLPaco Guzman2016-08-251-4/+17
|/
* Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-1/+142
|\
| * Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-10/+13
| * Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-1/+139
* | Add failing test for #21334winniehell2016-08-241-0/+10
|/
* Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-221-1/+1
|\
| * Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-191-1/+1
* | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+1
* | Merge branch 'directory-names-containing-space' into 'master' Robert Speicher2016-08-191-11/+10
|\ \
| * | Do not escape URI when extracting path (!5878)winniehell2016-08-191-11/+0
| * | Add failing test for gitlab-com/support-forum#952winniehell2016-08-191-0/+10
* | | Merge branch '20895-inline-comments-for-first-commit' into 'master' Douwe Maan2016-08-191-0/+42
|\ \ \ | |/ / |/| |
| * | Fix line commenting for the initial commitSean McGivern2016-08-191-0/+42
* | | Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' Douwe Maan2016-08-191-27/+40
|\ \ \ | |/ / |/| |
| * | Render coverage badge for latest successful pipelineGrzegorz Bizon2016-08-181-27/+40
| |/
* | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-184-0/+526
|\ \ | |/ |/|
| * Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-29/+48
| * Remove unneeded aliasesDouwe Maan2016-08-181-8/+8
| * Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-49/+15
| * Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1618-99/+677
| |\
| * | Fixed specs and fixes based on failing specsDouwe Maan2016-08-163-176/+222
| * | Refactor slash command definitionDouwe Maan2016-08-121-15/+15
| * | Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-132-55/+135
| * | New TodoService#todo_exists? methodRémy Coutable2016-08-131-1/+1
| * | Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-131-19/+42
| * | Make slash commands contextualRémy Coutable2016-08-131-15/+67
| * | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-132-7/+13
| * | Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-131-0/+27
| * | Add the /title slash commandRémy Coutable2016-08-131-2/+13
| * | Support slash commands in noteable description and notesRémy Coutable2016-08-133-0/+296
* | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |