Douwe MaanandRobert Speicher 1322bd78cf Merge branch 'rs-issue-4032' into 'master' ...

Fix note polling

Closes #4032

See merge request !2084

2015-12-15 12:16:17 -05:00

..

assets

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

controllers

Merge branch 'rs-issue-4032' into 'master'

2015-12-15 12:16:17 -05:00

finders

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

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

helpers

Merge branch 'gmail_actions_links_on_set_of_emails' into 'master'

2015-12-02 11:17:56 -05:00

mailers

Only pass abuse report ID to AbuseReportMailer.

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

models

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

services

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

uploaders

Merge branch 'ci-artifacts-path' into 'master'

2015-11-23 17:19:54 -05:00

views

Merge branch 'fix-merge-request-that-removes-submodule' into 'master'

2015-12-08 17:15:37 -05:00

workers

Merge branch 'ci-fix-500' into 'master'

2015-11-23 16:53:19 -05:00