Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix eslint errorheader-jquery | Filipa Lacerda | 2016-12-21 | 0 | -0/+0 |
| | |||||
* | Removes polyfill | Filipa Lacerda | 2016-12-21 | 1 | -12/+0 |
| | |||||
* | Removes replaced files | Filipa Lacerda | 2016-12-21 | 2 | -65/+0 |
| | |||||
* | Adds changelog entry | Filipa Lacerda | 2016-12-21 | 1 | -0/+4 |
| | |||||
* | Swap `event` for `e` | Filipa Lacerda | 2016-12-21 | 7 | -14/+14 |
| | |||||
* | Fix polyfill | Filipa Lacerda | 2016-12-21 | 1 | -8/+9 |
| | |||||
* | Remove jquery from todos icon with badge | Filipa Lacerda | 2016-12-21 | 7 | -8/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds polyfill for custom Event Fix es6 files Removes unused var Fixes after review Adds entry to CHANGELOG Fixes eslint rule for quotes Fix eslint error Revert changes CHANGELOG Fix broken test Fix eslint error Fix eslint error Simplifies the polyfill Removes eslint disable comment for new constructors | ||||
* | Merge branch 'dz-whitelist-more-project-names' into 'master' | Douwe Maan | 2016-12-21 | 2 | -1/+5 |
|\ | | | | | | | | | Whitelist more project names See merge request !8227 | ||||
| * | Whitelist next project names: help, ci, admin, searchdz-whitelist-more-project-names | Dmitriy Zaporozhets | 2016-12-21 | 2 | -1/+5 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'zj-remove-unused-services' into 'master' | Yorick Peterse | 2016-12-21 | 3 | -1/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove unused services from the database Closes #25727 See merge request !8225 | ||||
| * | | Remove unused services from the database | Z.J. van de Weg | 2016-12-21 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a migration to remove unused services, where the properties are empty. As the properties are empty, those do not contain any settings or other information. Fixes #25727 | ||||
* | | | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 0 | -0/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Use Grape's new Route methods See merge request !8223 | ||||
* \ \ \ | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 3 | -4/+8 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Use Grape's new Route methods See merge request !8223 | ||||
| * | | | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Route#request_method instead of Route#route_method - Use Route#path instead of Route#route_path Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master' | Jacob Schatz | 2016-12-21 | 2 | -17/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix space issue and add test Closes #25879 See merge request !8217 | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | big and mini pipeline css changes See merge request !8224 | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070 | ||||
| * \ \ \ \ | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`, | ||||
| * | | | | | | | 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 ↵ | Z.J. van de Weg | 2016-12-19 | 16 | -150/+289 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config | ||||
| | * | | | | | | | | 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 |
| | | | | | | | | | |