Jacob SchatzandRobert Speicher 7f17b1186d Merge branch 'award-emoji-fix' into 'master' ...

Fix emoji block selector.

Fixes #18465 and #18577

See merge request !4604

2016-06-16 18:15:00 -04:00

..

assets

Merge branch 'award-emoji-fix' into 'master'

2016-06-16 18:15:00 -04:00

controllers

Merge branch '18225-avoid-full-table-users-count' into 'master'

2016-06-15 15:12:56 +00:00

finders

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

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

helpers

Merge branch 'template_dropdown' into 'master'

2016-06-16 13:34:02 -04:00

mailers

UI and copywriting improvements

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

models

Merge branch 'fix/status-of-pipeline-without-builds' into 'master'

2016-06-16 13:28:06 -04:00

services

Merge branch 'fix/status-of-pipeline-without-builds' into 'master'

2016-06-16 13:28:06 -04: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 'merge-request-default-source-branch-text' into 'master'

2016-06-16 18:13:51 -04:00

workers

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

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