Commit graph

7 commits

Author SHA1 Message Date
Clement Ho
40f51c8e81 [skip ci] Fix FE conflicts with master 2017-05-05 09:19:58 -05:00
Valery Sizov
5004579b15 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip] 2017-05-05 16:59:31 +03:00
Kushal Pandya
645593e5af Add instant comments support 2017-05-05 10:57:29 +00:00
Valery Sizov
387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan
130a1e86e2 Fix specs 2017-04-07 20:03:39 -05:00
Annabel Dunstone Gray
fe215dacb8 Fix time tracking spec 2017-02-10 15:09:08 -06:00
Bryce Johnson
64dd41a0e2 Backport timetracking frontend to CE. 2017-01-15 11:10:04 -05:00