summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | 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 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-212-7/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added more specsJames Lopez2016-12-212-4/+6
| * | | | | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-202-7/+63
* | | | | | | | | | Merge branch '25561-maintain-milestone-filter-param' into 'master' Fatih Acet2016-12-212-0/+89
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Maintain milestone filter option when updating filter25561-maintain-milestone-filter-paramSam Rose2016-12-212-0/+89
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-211-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-211-3/+3
* | | | | | | | | | Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' Kamil Trzciński2016-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure nil User-Agent doesn't break the CI APIRémy Coutable2016-12-211-0/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Fix error importing label priorities and added relevant specJames Lopez2016-12-211-0/+22
|/ / / / / / / / /