Commit Graph

5 Commits

Author SHA1 Message Date
Mike Greiling 8b069dbb64 remove phantomjs-specific test hacks 2017-06-14 04:07:20 -05:00
Mike Greiling a526e619d9 Revert "Merge branch 'karma-headless-chrome' into 'master'"
This reverts merge request !12036
2017-06-13 15:20:26 +00:00
Mike Greiling 037b070653 remove phantomjs-specific test hacks 2017-06-13 00:23:39 -05:00
Kamil Trzcinski aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
2017-05-06 19:04:48 +02:00
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00