Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '25368-fix-left-align-system-note' into 'master' | Alfredo Sumaran | 2016-12-21 | 1 | -2/+6 |
|\ | |||||
| * | fixes left align issue for long system notes | Nur Rony | 2016-12-21 | 1 | -2/+6 |
* | | Merge branch 'dz-whitelist-more-project-names' into 'master' | Douwe Maan | 2016-12-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Whitelist next project names: help, ci, admin, searchdz-whitelist-more-project-names | Dmitriy Zaporozhets | 2016-12-21 | 1 | -1/+1 |
* | | | Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master' | Jacob Schatz | 2016-12-21 | 1 | -6/+0 |
|\ \ \ | |||||
| * | | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerly | Luke "Jared" Bennett | 2016-12-21 | 1 | -6/+0 |
| | |/ | |/| | |||||
* | | | Merge branch 'minor-pipeline-graph-beautyfixes' into 'master' | Fatih Acet | 2016-12-21 | 2 | -26/+46 |
|\ \ \ | |||||
| * | | | pipeline css changesminor-pipeline-graph-beautyfixes | dimitrieh | 2016-12-21 | 2 | -26/+46 |
| |/ / | |||||
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil TrzciĆski | 2016-12-21 | 12 | -90/+270 |
|\ \ \ | |||||
| * | | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 1 | -3/+3 |
| * | | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 1 | -0/+9 |
| * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 1 | -3/+3 |
| * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 43 | -198/+842 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 1 | -3/+6 |
| |\ \ \ \ | |||||
| | * | | | | Pedro copy changes | Luke "Jared" Bennett | 2016-12-20 | 1 | -3/+6 |
| * | | | | | WIP | Kamil Trzcinski | 2016-12-20 | 4 | -24/+17 |
| * | | | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 1 | -4/+4 |
| * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 37 | -185/+343 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Remove rest of the form parameters as we can't really support them | Kamil Trzcinski | 2016-12-20 | 2 | -14/+5 |
| * | | | | | Fix flow | Kamil Trzcinski | 2016-12-20 | 2 | -7/+5 |
| * | | | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 8 | -89/+72 |
| * | | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 7 | -2/+63 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 11 | -115/+207 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | kamil frontend review changes | Luke "Jared" Bennett | 2016-12-19 | 5 | -54/+60 |
| | * | | | | | | zj frontend review | Luke "Jared" Bennett | 2016-12-19 | 2 | -4/+3 |
| | * | | | | | | Remove mock emoji comments | Luke "Jared" Bennett | 2016-12-19 | 1 | -5/+0 |
| | * | | | | | | Removed UI to show the registered team as its not yet possible | Luke "Jared" Bennett | 2016-12-19 | 1 | -4/+0 |
| | * | | | | | | UX review changes | Luke "Jared" Bennett | 2016-12-19 | 3 | -16/+25 |
| | * | | | | | | Correct views for first iteration agreement | Luke "Jared" Bennett | 2016-12-19 | 6 | -59/+146 |
| | * | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 1 | -2/+2 |
| * | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 2 | -16/+28 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-19 | 8 | -148/+168 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Started on new slash commands edit viewmattermost-configure-frontend | Luke "Jared" Bennett | 2016-12-17 | 8 | -149/+169 |
| * | | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 142 | -1018/+1853 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fix configure route | Luke "Jared" Bennett | 2016-12-17 | 1 | -2/+1 |
| * | | | | | | | Incorporate review | Z.J. van de Weg | 2016-12-16 | 3 | -9/+21 |
| * | | | | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 5 | -88/+47 |
| * | | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-16 | 3 | -15/+16 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add auto configure of commands | Z.J. van de Weg | 2016-12-16 | 3 | -19/+8 |
| * | | | | | | | | Add MattermostController | Z.J. van de Weg | 2016-12-16 | 3 | -98/+153 |
| * | | | | | | | | Base work for auto config MM slash commands | Z.J. van de Weg | 2016-12-16 | 8 | -145/+206 |
* | | | | | | | | | Merge branch '25897-textarea-stops-accepting-space-and-return-characters-with... | Fatih Acet | 2016-12-21 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removed hack25897-textarea-stops-accepting-space-and-return-characters-with-no-warning | Luke "Jared" Bennett | 2016-12-21 | 1 | -7/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' | Douwe Maan | 2016-12-21 | 3 | -3/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix reset pathfix/group-path-rename-error | James Lopez | 2016-12-21 | 1 | -1/+1 |
| * | | | | | | | | | added more specs | James Lopez | 2016-12-21 | 1 | -0/+2 |
| * | | | | | | | | | update controller action to render error in form | James Lopez | 2016-12-21 | 1 | -4/+1 |
| * | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. | James Lopez | 2016-12-20 | 3 | -4/+13 |