delta/gitlab/gitlab-ce.git/features/steps, branch parallel-tests

Merge branch 'group-activity-separate-tab' into 'master'

2016-03-11T19:58:10+00:00


Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157

Merge branch 'award-emoji-design-update' into 'master'

2016-03-11T16:06:18+00:00


Updated UI of award emoji

Closes #13878 

See merge request !3028

Merge branch 'account-settings' into 'master'

2016-03-11T13:08:40+00:00


Account settings

Closes #13854

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png)

See merge request !3039

Merge branch 'comment-discard-button' into 'master'

2016-03-11T13:07:43+00:00


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


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

Fixed failing tests

2016-03-11T09:51:07+00:00

Updated award emoji tests

2016-03-11T09:02:43+00:00

web hooks to webhooks

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

Change test in an attempt to pass.

2016-03-10T17:20:00+00:00

Thanks @rspeicher!

Fixed failing tests

2016-03-10T13:54:54+00:00