Yorick Peterse 3589e549ab Merge branch '14320-note-grouped_awards' into 'master' ...

Include user relationship when retrieving award_emoji

See merge request !4647

2016-06-15 09:14:01 +00:00

..

assets

Merge branch 'rs-fix-note-polling' into 'master'

2016-06-14 22:03:58 +00:00

controllers

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2016-06-15 10:59:33 +03:00

finders

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2016-06-15 10:59:33 +03:00

helpers

Merge branch 'manual-todos-issuable-sidebar' into 'master'

2016-06-14 22:01:43 +00:00

mailers

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

models

Include user relationship when retrieving award_emoji

2016-06-15 06:50:12 +02:00

services

Merge branch 'manual-todos-issuable-sidebar' into 'master'

2016-06-14 22:01:43 +00:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'manual-todos-issuable-sidebar' into 'master'

2016-06-14 22:01:43 +00:00

workers

Merge branch 'dont-drop-stuck-builds' into 'master'

2016-06-15 02:54:19 +00:00