Commit f89a7471 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq

parents 7af1bc3b 92768844
...@@ -16,6 +16,7 @@ gem "pg", group: :postgres ...@@ -16,6 +16,7 @@ gem "pg", group: :postgres
# Auth # Auth
gem "devise", '~> 2.2' gem "devise", '~> 2.2'
gem "devise-async"
gem 'omniauth', "~> 1.1.3" gem 'omniauth', "~> 1.1.3"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
......
...@@ -106,6 +106,8 @@ GEM ...@@ -106,6 +106,8 @@ GEM
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.2.1) warden (~> 1.2.1)
devise-async (0.8.0)
devise (>= 2.2, < 3.2)
diff-lcs (1.2.4) diff-lcs (1.2.4)
dotenv (0.8.0) dotenv (0.8.0)
email_spec (1.4.0) email_spec (1.4.0)
...@@ -564,6 +566,7 @@ DEPENDENCIES ...@@ -564,6 +566,7 @@ DEPENDENCIES
d3_rails (~> 3.1.4) d3_rails (~> 3.1.4)
database_cleaner database_cleaner
devise (~> 2.2) devise (~> 2.2)
devise-async
email_spec email_spec
enumerize enumerize
factory_girl_rails factory_girl_rails
......
...@@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord' ...@@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord'
require 'file_size_validator' require 'file_size_validator'
class User < ActiveRecord::Base class User < ActiveRecord::Base
devise :database_authenticatable, :token_authenticatable, :lockable, devise :database_authenticatable, :token_authenticatable, :lockable, :async,
:recoverable, :rememberable, :trackable, :validatable, :omniauthable, :registerable :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :registerable
attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username, attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username,
...@@ -398,4 +398,4 @@ class User < ActiveRecord::Base ...@@ -398,4 +398,4 @@ class User < ActiveRecord::Base
self self
end end
end end
\ No newline at end of file
Devise::Async.backend = :sidekiq
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment