Stan Hu 3656b5db07 Merge branch 'issues/15127' into 'master' ...

fix #15127 ActiveJob::DeserializationError thrown

`send_devise_notification` pre-maturely enqueued the task when the user instance
has not yet been committed into the database, causing a record-not-found in the
other sidekiq process.

`devise-async` has already been taking care of asynchronous mail sending, we just
need to run it inside queue `mailers` instead of `mailer` to enable it.

The implementation of `devise-async` enqueues the task in `after_commit` hook
which is the right way to do it.

See merge request !3647

2016-05-19 06:12:34 +00:00

..

assets

Merge branch 'fix-typo-zen-control' into 'master'

2016-05-18 17:26:56 +00:00

controllers

Merge branch 'docker-registry-view' into 'master'

2016-05-18 18:19:01 +00:00

finders

Make upcoming milestone work across projects

2016-05-16 10:25:24 +01:00

helpers

Merge branch '15584-remove-back-compat-code' into 'master'

2016-05-18 18:52:06 +00:00

mailers

Only generate repository push email once

2016-05-11 09:16:01 +01:00

models

Merge branch 'issues/15127' into 'master'

2016-05-19 06:12:34 +00:00

services

Merge branch 'docker-registry-view' into 'master'

2016-05-18 18:19:01 +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 'docker-registry-view' into 'master'

2016-05-18 18:19:01 +00:00

workers

Mask credentials from URL when import of project has failed.

2016-05-18 21:16:36 -05:00