Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d46e47a5
Commit
d46e47a5
authored
May 19, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'issues/15127' into 'master'"
This reverts merge request !3647
parent
3656b5db
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/models/user.rb
app/models/user.rb
+5
-0
config/initializers/devise_async.rb
config/initializers/devise_async.rb
+0
-1
No files found.
app/models/user.rb
View file @
d46e47a5
...
@@ -789,6 +789,11 @@ class User < ActiveRecord::Base
...
@@ -789,6 +789,11 @@ class User < ActiveRecord::Base
other
.
select
(
:id
)])
other
.
select
(
:id
)])
end
end
# Added according to https://github.com/plataformatec/devise/blob/7df57d5081f9884849ca15e4fde179ef164a575f/README.md#activejob-integration
def
send_devise_notification
(
notification
,
*
args
)
devise_mailer
.
send
(
notification
,
self
,
*
args
).
deliver_later
end
def
ensure_external_user_rights
def
ensure_external_user_rights
return
unless
self
.
external?
return
unless
self
.
external?
...
...
config/initializers/devise_async.rb
View file @
d46e47a5
Devise
::
Async
.
backend
=
:sidekiq
Devise
::
Async
.
backend
=
:sidekiq
Devise
::
Async
.
queue
=
:mailers
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment