Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '25979-fix-todos-on-failed-build' into 'master' | Robert Speicher | 2016-12-22 | 2 | -0/+20 |
|\ | |||||
| * | Fix viewing "build failed" TODOs | Nick Thomas | 2016-12-22 | 2 | -0/+20 |
* | | Merge branch 'zj-slack-404-error' into 'master' | Kamil Trzciński | 2016-12-22 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fix format of Slack when result is nilzj-slack-404-error | Z.J. van de Weg | 2016-12-22 | 1 | -1/+2 |
* | | | Merge branch 'fix-mattermost-username' into 'master' | Douglas Barbosa Alexandre | 2016-12-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix Mattermost command creation by specifying username | Kamil Trzcinski | 2016-12-22 | 1 | -1/+1 |
| |/ / | |||||
* | | | 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 |
| |/ / | |||||
* | | | Merge branch 'fix/hide-retried-builds-in-pipeline-stage-dropdown' into 'master' | Kamil Trzciński | 2016-12-22 | 1 | -6/+38 |
|\ \ \ | |||||
| * | | | Do not show retried builds in pipeline stage dropdown | Grzegorz Bizon | 2016-12-22 | 1 | -6/+38 |
| | |/ | |/| | |||||
* | | | Merge branch 'cache-last-commit-sha-for-path' into 'master' | Yorick Peterse | 2016-12-22 | 1 | -0/+16 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge two methods. | Hiroyuki Sato | 2016-12-20 | 1 | -5/+5 |
| * | | Add a blank line before first expect. | Hiroyuki Sato | 2016-12-20 | 1 | -0/+1 |
| * | | Clean-up spec | Hiroyuki Sato | 2016-12-20 | 1 | -10/+4 |
| * | | Add specs. | Hiroyuki Sato | 2016-12-20 | 1 | -0/+21 |
* | | | Fix lookup of project by unknown ref when caching is enabled | Douwe Maan | 2016-12-22 | 2 | -52/+103 |
| |/ |/| | |||||
* | | Merge branch '23638-remove-builds-tab' into 'master' | Kamil Trzciński | 2016-12-21 | 3 | -13/+11 |
|\ \ | |||||
| * | | Changes after review | Filipa Lacerda | 2016-12-21 | 1 | -5/+7 |
| * | | Removes builds tab from merge request | Filipa Lacerda | 2016-12-21 | 2 | -8/+4 |
* | | | Merge branch 'adam-auto-deploy' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -0/+64 |
|\ \ \ | |||||
| * | | | Revert conflicting EE changes | Kamil Trzcinski | 2016-12-21 | 8 | -22/+30 |
| * | | | Added Autodeploy script for OpenShift | Kamil Trzcinski | 2016-12-21 | 1 | -2/+2 |
| * | | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy | Adam Niedzielski | 2016-12-21 | 8 | -21/+77 |
| |/ / | |||||
* | | | 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 '25879-emoji-autocomplete-starts-too-eagerly' into 'master' | Jacob Schatz | 2016-12-21 | 1 | -11/+16 |
|\ \ \ \ | |||||
| * | | | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerly | Luke "Jared" Bennett | 2016-12-21 | 1 | -11/+16 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 7 | -15/+371 |
|\ \ \ \ | |||||
| * | | | | Add new tests | Z.J. van de Weg | 2016-12-21 | 3 | -1/+54 |
| * | | | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 3 | -49/+203 |
| * | | | | 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 | 5 | -37/+86 |
| |\ \ \ \ | |||||
| | * | | | | Add controller test | Z.J. van de Weg | 2016-12-20 | 1 | -0/+53 |
| | * | | | | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 4 | -34/+31 |
| | * | | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 2 | -4/+3 |
| * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 35 | -606/+2309 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 1 | -35/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix tests | Luke "Jared" Bennett | 2016-12-20 | 1 | -35/+5 |
| * | | | | | | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -11/+9 |
| * | | | | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 1 | -0/+35 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 50 | -254/+752 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 | 6 | -1/+168 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 4 | -32/+81 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Added integration tests | Luke "Jared" Bennett | 2016-12-19 | 1 | -14/+53 |
| | * | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 4 | -16/+15 |
| * | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 5 | -31/+45 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 90 | -457/+2413 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 5 | -8/+61 |