Robert SpeicherandRobert Speicher dbcd646296 Merge branch 'award_fix' into 'master' ...

Emoji bug: Invalid url to image

Closes #3591

See merge request !1868

2015-11-21 23:11:45 -05:00

..

assets

Merge branch 'award_fix' into 'master'

2015-11-21 23:11:45 -05:00

controllers

Merge branch 'award_fix' into 'master'

2015-11-21 23:11:45 -05:00

finders

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

helpers

Fix for Emoji

2015-11-20 11:23:04 +02:00

mailers

Only pass abuse report ID to AbuseReportMailer.

2015-10-18 11:58:45 +02:00

models

Merge branch 'fix-merge-requests-without-source-projects' into 'master'

2015-11-21 22:53:08 -05:00

services

Merge branch 'consistent-tags-api' into 'master'

2015-11-21 22:38:13 -05:00

uploaders

Merge branch 'refactor-duplication' into 'master'

2015-11-16 13:05:49 +00:00

views

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

workers

Merge branch 'issue_3598' into 'master'

2015-11-21 12:20:44 -05:00