summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix eslint errorheader-jqueryFilipa Lacerda2016-12-210-0/+0
|
* Removes polyfillFilipa Lacerda2016-12-211-12/+0
|
* Removes replaced filesFilipa Lacerda2016-12-212-65/+0
|
* Adds changelog entryFilipa Lacerda2016-12-211-0/+4
|
* Swap `event` for `e`Filipa Lacerda2016-12-217-14/+14
|
* Fix polyfillFilipa Lacerda2016-12-211-8/+9
|
* Remove jquery from todos icon with badgeFilipa Lacerda2016-12-217-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 Maan2016-12-212-1/+5
|\ | | | | | | | | Whitelist more project names See merge request !8227
| * Whitelist next project names: help, ci, admin, searchdz-whitelist-more-project-namesDmitriy Zaporozhets2016-12-212-1/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'zj-remove-unused-services' into 'master' Yorick Peterse2016-12-213-1/+18
|\ \ | | | | | | | | | | | | | | | | | | Remove unused services from the database Closes #25727 See merge request !8225
| * | Remove unused services from the databaseZ.J. van de Weg2016-12-213-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 Peterse2016-12-210-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Use Grape's new Route methods See merge request !8223
* \ \ \ Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-213-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | Use Grape's new Route methods See merge request !8223
| * | | Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-213-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 Schatz2016-12-212-17/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix space issue and add test Closes #25879 See merge request !8217
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | big and mini pipeline css changes See merge request !8224
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-configZ.J. van de Weg2016-12-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Z.J. van de Weg2016-12-202-8/+35
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`,
| * | | | | | | 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 ↵Z.J. van de Weg2016-12-1916-150/+289
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config
| | * | | | | | | | 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
| | | | | | | | | |