Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'inline-math-dollar' into 'master' | Robert Speicher | 2016-12-22 | 1 | -0/+7 |
|\ | |||||
| * | Don't render inline math when dollar signs are inside markupinline-math-dollar | Douwe Maan | 2016-12-22 | 1 | -0/+7 |
* | | Fix lookup of project by unknown ref when caching is enabled | Douwe Maan | 2016-12-22 | 2 | -52/+103 |
|/ | |||||
* | Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742. | Makoto Scott-Hinkle | 2016-12-21 | 1 | -0/+14 |
* | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 1 | -2/+2 |
|\ | |||||
| * | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 1 | -2/+2 |
* | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 4 | -0/+175 |
|\ \ | |||||
| * | | Add new tests | Z.J. van de Weg | 2016-12-21 | 2 | -0/+48 |
| * | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 2 | -30/+103 |
| * | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 1 | -3/+1 |
| * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 2 | -17/+15 |
| |\ \ | |||||
| | * | | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 2 | -17/+15 |
| * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 9 | -180/+525 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -11/+9 |
| * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 22 | -20/+214 |
| |\ \ \ | |||||
| * | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -12/+12 |
| * | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 2 | -0/+72 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 2 | -17/+28 |
| |\ \ \ \ \ | |||||
| | * | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -15/+15 |
| * | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -15/+25 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 24 | -140/+703 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 2 | -8/+28 |
| * | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-15 | 2 | -42/+68 |
| | * | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-12 | 1 | -0/+42 |
| * | | | | | | | Add auto configure of commands | Z.J. van de Weg | 2016-12-16 | 1 | -0/+19 |
| * | | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-16 | 2 | -42/+68 |
| * | | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-16 | 1 | -0/+42 |
* | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' | Rémy Coutable | 2016-12-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Inject ::UploadedFile from Multipart middleware | Jacob Vosmaer | 2016-12-21 | 1 | -3/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fix error importing label priorities and added relevant spec | James Lopez | 2016-12-21 | 1 | -0/+22 |
* | | | | | | | Rename MattermostNotificationService back to MattermostServicefix/25843 | Douglas Barbosa Alexandre | 2016-12-20 | 1 | -1/+1 |
* | | | | | | | Rename SlackNotificationService back to SlackService | Douglas Barbosa Alexandre | 2016-12-20 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch '22348-gitea-importer' into 'master' | Rémy Coutable | 2016-12-20 | 7 | -180/+450 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Project#gitea_import?22348-gitea-importer | Rémy Coutable | 2016-12-19 | 1 | -1/+1 |
| * | | | | | | Improve Gitlab::ImportSources | Rémy Coutable | 2016-12-19 | 1 | -0/+94 |
| * | | | | | | Modify GithubImport to support Gitea | Rémy Coutable | 2016-12-19 | 6 | -180/+356 |
* | | | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' | Kamil Trzciński | 2016-12-20 | 2 | -0/+75 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Add terminals to the Kubernetes deployment service | Nick Thomas | 2016-12-19 | 2 | -0/+75 |
* | | | | | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' | Sean McGivern | 2016-12-20 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsing | Rémy Coutable | 2016-12-20 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' | Grzegorz Bizon | 2016-12-20 | 2 | -2/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix spec failures | Kamil Trzcinski | 2016-12-18 | 1 | -0/+1 |
| * | | | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compat | Kamil Trzcinski | 2016-12-16 | 1 | -11/+3 |
| * | | | | | | | Fix SlackSlashCommands tests | Kamil Trzcinski | 2016-12-16 | 1 | -5/+15 |
| * | | | | | | | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 1 | -2/+24 |
* | | | | | | | | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 3 | -4/+60 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 3 | -4/+60 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-yaml-variables' into 'master' | Grzegorz Bizon | 2016-12-19 | 2 | -12/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix tests because now we don't convert valuesfix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 1 | -2/+2 |