delta/gitlab/gitlab-ce.git/features/steps/project, branch fix-commit-status-rendering gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'award-emoji-design-update' into 'master' 2016-03-11T16:06:18+00:00 Jacob Schatz jschatz1@gmail.com 2016-03-11T16:06:18+00:00 6968ea32e2beade8bc5aee9c30451b6ed48fcc5f Updated UI of award emoji Closes #13878 See merge request !3028 

Updated UI of award emoji

Closes #13878 

See merge request !3028
 Merge branch 'comment-discard-button' into 'master' 2016-03-11T13:07:43+00:00 Jacob Schatz jschatz1@gmail.com 2016-03-11T13:07:43+00:00 d343c7a159a1786e2d43f1a060b7c79edbd67376 Added discard button to comment form Also changed the labels on the buttons to better match the action they are completing. Closes #8057 See merge request !3085 

Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 Merge branch 'comment-error' into 'master' 2016-03-11T13:00:59+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-03-11T13:00:59+00:00 1f08363650169925f01261863ee905ad103a177f Add error for ajax:error when submitting comments Fixes #13814 ![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png) cc @dblessing See merge request !2976 

Add error for ajax:error when submitting comments

Fixes #13814
![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png)
cc @dblessing 

See merge request !2976
 Updated award emoji tests 2016-03-11T09:02:43+00:00 Phil Hughes me@iamphill.com 2016-03-01T13:00:26+00:00 a7e76a6119b4f51bdb29ea1420c151081cd12d77 






web hooks to webhooks
2016-03-10T19:48:29+00:00

ashleys
ashley@gitlab.com

2016-03-10T19:48:29+00:00

4cd9a5208cd5148c95d1de33c419b9d579985fb9












Change test in an attempt to pass.
2016-03-10T17:20:00+00:00

Jacob Schatz
jacobschatz@Jacobs-MBP.fios-router.home

2016-02-29T18:03:21+00:00

136ba502d3ad3378f7746a18c3045346a2f49081

Thanks @rspeicher!





Thanks @rspeicher!







Fixed failing tests
2016-03-10T13:54:54+00:00

Phil Hughes
me@iamphill.com

2016-03-09T13:34:39+00:00

8d7e0f0ba93be42119f1c497f280353a13065c85












Remove redundant integration tests
2016-03-07T20:33:26+00:00

Robert Speicher
rspeicher@gmail.com

2016-03-07T20:24:27+00:00

56c4f22c80b0555d5d7cfbc7f443122a8b70072c

These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.





These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.







Merge branch 'issue_13621_2' into 'master'

2016-03-07T17:18:25+00:00

Douwe Maan
douwe@gitlab.com

2016-03-07T17:18:25+00:00

903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4


Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931





Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931






Merge branch 'rs-factory-nitpicks' into 'master'

2016-03-07T09:02:49+00:00

Douwe Maan
douwe@gitlab.com

2016-03-07T09:02:49+00:00

eab7892dc1eaca0bcca0fc82fb7da79b81cad39d


More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108





More Factory cleanup

Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847

See merge request !3108