summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25979-fix-todos-on-failed-build' into 'master' Robert Speicher2016-12-222-0/+20
|\
| * Fix viewing "build failed" TODOsNick Thomas2016-12-222-0/+20
* | Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-221-1/+2
|\ \
| * | Fix format of Slack when result is nilzj-slack-404-errorZ.J. van de Weg2016-12-221-1/+2
* | | Merge branch 'fix-mattermost-username' into 'master' Douglas Barbosa Alexandre2016-12-221-1/+1
|\ \ \
| * | | Fix Mattermost command creation by specifying usernameKamil Trzcinski2016-12-221-1/+1
| |/ /
* | | 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
| |/ /
* | | Merge branch 'fix/hide-retried-builds-in-pipeline-stage-dropdown' into 'master' Kamil Trzciński2016-12-221-6/+38
|\ \ \
| * | | Do not show retried builds in pipeline stage dropdownGrzegorz Bizon2016-12-221-6/+38
| | |/ | |/|
* | | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-0/+16
|\ \ \ | |/ / |/| |
| * | Merge two methods.Hiroyuki Sato2016-12-201-5/+5
| * | Add a blank line before first expect.Hiroyuki Sato2016-12-201-0/+1
| * | Clean-up specHiroyuki Sato2016-12-201-10/+4
| * | Add specs.Hiroyuki Sato2016-12-201-0/+21
* | | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-222-52/+103
| |/ |/|
* | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-213-13/+11
|\ \
| * | Changes after reviewFilipa Lacerda2016-12-211-5/+7
| * | Removes builds tab from merge requestFilipa Lacerda2016-12-212-8/+4
* | | Merge branch 'adam-auto-deploy' into 'master' Kamil Trzciński2016-12-211-0/+64
|\ \ \
| * | | Revert conflicting EE changesKamil Trzcinski2016-12-218-22/+30
| * | | Added Autodeploy script for OpenShiftKamil Trzcinski2016-12-211-2/+2
| * | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deployAdam Niedzielski2016-12-218-21/+77
| |/ /
* | | 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 '25879-emoji-autocomplete-starts-too-eagerly' into 'master' Jacob Schatz2016-12-211-11/+16
|\ \ \ \
| * | | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerlyLuke "Jared" Bennett2016-12-211-11/+16
| | |/ / | |/| |
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-217-15/+371
|\ \ \ \
| * | | | Add new testsZ.J. van de Weg2016-12-213-1/+54
| * | | | Improve API specsKamil Trzcinski2016-12-213-49/+203
| * | | | 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-205-37/+86
| |\ \ \ \
| | * | | | Add controller testZ.J. van de Weg2016-12-201-0/+53
| | * | | | Fix rspec tests due to different APIZ.J. van de Weg2016-12-204-34/+31
| | * | | | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-202-4/+3
| * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2035-606/+2309
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-35/+5
| |\ \ \ \ \
| | * | | | | Fix testsLuke "Jared" Bennett2016-12-201-35/+5
| * | | | | | WIPKamil Trzcinski2016-12-202-11/+9
| * | | | | | Work on tests for mattermostKamil Trzcinski2016-12-201-0/+35
| * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2050-254/+752
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Last fixesZ.J. van de Weg2016-12-191-12/+12
| * | | | | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-196-1/+168
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-194-32/+81
| |\ \ \ \ \ \ \
| | * | | | | | | Added integration testsLuke "Jared" Bennett2016-12-191-14/+53
| | * | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-194-16/+15
| * | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-195-31/+45
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1890-457/+2413
| |\ \ \ \ \ \ \
| * | | | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-165-8/+61