summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'inline-math-dollar' into 'master' Robert Speicher2016-12-221-0/+7
|\
| * Don't render inline math when dollar signs are inside markupinline-math-dollarDouwe Maan2016-12-221-0/+7
* | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-222-52/+103
|/
* Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742.Makoto Scott-Hinkle2016-12-211-0/+14
* Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-211-2/+2
|\
| * Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-211-2/+2
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-214-0/+175
|\ \
| * | Add new testsZ.J. van de Weg2016-12-212-0/+48
| * | Improve API specsKamil Trzcinski2016-12-212-30/+103
| * | Fix a few error messagesKamil Trzcinski2016-12-201-3/+1
| * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-202-17/+15
| |\ \
| | * | Fix rspec tests due to different APIZ.J. van de Weg2016-12-202-17/+15
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-209-180/+525
| |\ \ \ | | |/ / | |/| |
| * | | WIPKamil Trzcinski2016-12-202-11/+9
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2022-20/+214
| |\ \ \
| * | | | Last fixesZ.J. van de Weg2016-12-191-12/+12
| * | | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-192-0/+72
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-192-17/+28
| |\ \ \ \ \
| | * | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-15/+15
| * | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-15/+25
| |/ / / / /
| * | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1824-140/+703
| |\ \ \ \ \
| * | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-162-8/+28
| * | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-161-1/+1
| |\ \ \ \ \ \
| | * | | | | | Improve session testsZ.J. van de Weg2016-12-152-42/+68
| | * | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-121-0/+42
| * | | | | | | Add auto configure of commandsZ.J. van de Weg2016-12-161-0/+19
| * | | | | | | Improve session testsZ.J. van de Weg2016-12-162-42/+68
| * | | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-161-0/+42
* | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-211-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-211-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix error importing label priorities and added relevant specJames Lopez2016-12-211-0/+22
* | | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-201-1/+1
* | | | | | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-201-1/+1
|/ / / / / /
* | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-207-180/+450
|\ \ \ \ \ \
| * | | | | | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-191-1/+1
| * | | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-191-0/+94
| * | | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-196-180/+356
* | | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-202-0/+75
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-192-0/+75
* | | | | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-201-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-201-0/+7
* | | | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-2/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix spec failuresKamil Trzcinski2016-12-181-0/+1
| * | | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-161-11/+3
| * | | | | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-161-5/+15
| * | | | | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-161-2/+24
* | | | | | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-193-4/+60
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add Wiki import to BB importerValery Sizov2016-12-193-4/+60
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-192-12/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix tests because now we don't convert valuesfix-yaml-variablesLin Jen-Shin2016-12-191-2/+2