summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Docs on MM auto configzj-mattermost-auto-config-docsZ.J. van de Weg2016-12-211-2/+8
* Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master' Jacob Schatz2016-12-212-17/+16
|\
| * Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerlyLuke "Jared" Bennett2016-12-212-17/+16
* | Merge branch 'minor-pipeline-graph-beautyfixes' into 'master' Fatih Acet2016-12-212-26/+46
|\ \
| * | pipeline css changesminor-pipeline-graph-beautyfixesdimitrieh2016-12-212-26/+46
| |/
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil TrzciƄski2016-12-2127-115/+763
|\ \
| * \ Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...zj-mattermost-slash-configZ.J. van de Weg2016-12-210-0/+0
| |\ \
| | * | Add new testsZ.J. van de Weg2016-12-212-0/+48
| * | | Add new testsZ.J. van de Weg2016-12-213-1/+54
| |/ /
| * | Improve API specsKamil Trzcinski2016-12-216-66/+228
| * | Fix a few error messagesKamil Trzcinski2016-12-205-18/+14
| * | Use separate file for error.rbKamil Trzcinski2016-12-201-2/+0
| * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-208-43/+92
| |\ \
| | * | Add controller testZ.J. van de Weg2016-12-201-0/+53
| | * | Fix rspec tests due to different APIZ.J. van de Weg2016-12-205-36/+33
| | * | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Z.J. van de Weg2016-12-202-8/+35
| | |\ \
| | * | | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-204-8/+7
| * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-20130-1139/+8284
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Add missing Mattermost::ErrorKamil Trzcinski2016-12-201-0/+3
| * | | | Add with_lease to session [ci skip]Kamil Trzcinski2016-12-201-8/+32
| | |/ / | |/| |
| * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-202-38/+11
| |\ \ \
| | * | | Pedro copy changesLuke "Jared" Bennett2016-12-201-3/+6
| | * | | Fix testsLuke "Jared" Bennett2016-12-201-35/+5
| * | | | WIPKamil Trzcinski2016-12-208-49/+40
| * | | | Work on tests for mattermostKamil Trzcinski2016-12-204-7/+56
| * | | | Fix Mattermost clientKamil Trzcinski2016-12-201-1/+1
| * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-20149-939/+1506
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Remove rest of the form parameters as we can't really support themKamil Trzcinski2016-12-202-14/+5
| * | | | Fix flowKamil Trzcinski2016-12-205-28/+51
| * | | | Improve sourcesKamil Trzcinski2016-12-1912-97/+96
| * | | | Last fixesZ.J. van de Weg2016-12-193-17/+13
| * | | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-1936-156/+406
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-1916-150/+289
| |\ \ \ \ \
| | * | | | | kamil frontend review changesLuke "Jared" Bennett2016-12-195-54/+60
| | * | | | | Added integration testsLuke "Jared" Bennett2016-12-191-14/+53
| | * | | | | zj frontend reviewLuke "Jared" Bennett2016-12-192-4/+3
| | * | | | | Remove mock emoji commentsLuke "Jared" Bennett2016-12-191-5/+0
| | * | | | | Removed UI to show the registered team as its not yet possibleLuke "Jared" Bennett2016-12-191-4/+0
| | * | | | | UX review changesLuke "Jared" Bennett2016-12-193-16/+25
| | * | | | | Correct views for first iteration agreementLuke "Jared" Bennett2016-12-196-59/+146
| | * | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-198-38/+31
| * | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-1911-76/+91
| |/ / / / /
| * | | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-198-148/+168
| |\ \ \ \ \
| | * | | | | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-178-149/+169
| * | | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-18470-2142/+15996
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix configure routeLuke "Jared" Bennett2016-12-172-3/+2
| * | | | | | Incorporate reviewZ.J. van de Weg2016-12-164-21/+21
| * | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-1613-104/+123
| * | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-166-33/+32
| |\ \ \ \ \ \
| | * | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-151-3/+5