Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Remove unused services from the database | Z.J. van de Weg | 2016-12-21 | 3 | -1/+18 | |
* | | | | | | | | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 3 | -4/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 3 | -4/+8 | |
* | | | | | | | | | Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master' | Jacob Schatz | 2016-12-21 | 2 | -17/+16 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerly | Luke "Jared" Bennett | 2016-12-21 | 2 | -17/+16 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | 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 | 27 | -115/+763 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add new tests | Z.J. van de Weg | 2016-12-21 | 2 | -0/+48 | |
| * | | | | | | | | | Add new tests | Z.J. van de Weg | 2016-12-21 | 3 | -1/+54 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 6 | -66/+228 | |
| * | | | | | | | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 5 | -18/+14 | |
| * | | | | | | | | Use separate file for error.rb | Kamil Trzcinski | 2016-12-20 | 1 | -2/+0 | |
| * | | | | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 8 | -43/+92 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | 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 | 5 | -36/+33 | |
| | * | | | | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 4 | -8/+7 | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 130 | -1139/+8284 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Add missing Mattermost::Error | Kamil Trzcinski | 2016-12-20 | 1 | -0/+3 | |
| * | | | | | | | | | | Add with_lease to session [ci skip] | Kamil Trzcinski | 2016-12-20 | 1 | -8/+32 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 2 | -38/+11 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Pedro copy changes | Luke "Jared" Bennett | 2016-12-20 | 1 | -3/+6 | |
| | * | | | | | | | | | Fix tests | Luke "Jared" Bennett | 2016-12-20 | 1 | -35/+5 | |
| * | | | | | | | | | | WIP | Kamil Trzcinski | 2016-12-20 | 8 | -49/+40 | |
| * | | | | | | | | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 4 | -7/+56 | |
| * | | | | | | | | | | Fix Mattermost client | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 149 | -939/+1506 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | 5 | -28/+51 | |
| * | | | | | | | | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 12 | -97/+96 | |
| * | | | | | | | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 3 | -17/+13 | |
| * | | | | | | | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 36 | -156/+406 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 16 | -150/+289 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | kamil frontend review changes | Luke "Jared" Bennett | 2016-12-19 | 5 | -54/+60 | |
| | * | | | | | | | | | | | Added integration tests | Luke "Jared" Bennett | 2016-12-19 | 1 | -14/+53 | |
| | * | | | | | | | | | | | 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 | 8 | -38/+31 | |
| * | | | | | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 11 | -76/+91 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | 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 | 470 | -2142/+15996 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix configure route | Luke "Jared" Bennett | 2016-12-17 | 2 | -3/+2 | |
| * | | | | | | | | | | | | Incorporate review | Z.J. van de Weg | 2016-12-16 | 4 | -21/+21 |