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

Dmitriy Zaporozhets
2 parents 7af1bc3b 92768844
Showing 4 changed files with 7 additions and 2 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/user.rb
config/initializers/devise_async.rb
@@ -16,6 +16,7 @@ gem &quot;pg&quot;, group: :postgres
  
 # Auth
 gem "devise", '~> 2.2'
+gem "devise-async"
 gem 'omniauth', "~> 1.1.3"
 gem 'omniauth-google-oauth2'
 gem 'omniauth-twitter'
@@ -106,6 +106,8 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    devise-async (0.8.0)
+      devise (>= 2.2, < 3.2)
     diff-lcs (1.2.4)
     dotenv (0.8.0)
     email_spec (1.4.0)
@@ -564,6 +566,7 @@ DEPENDENCIES
   d3_rails (~> 3.1.4)
   database_cleaner
   devise (~> 2.2)
+  devise-async
   email_spec
   enumerize
   factory_girl_rails
@@ -42,7 +42,7 @@ require &#39;carrierwave/orm/activerecord&#39;
 require 'file_size_validator'
  
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :token_authenticatable, :lockable,
+  devise :database_authenticatable, :token_authenticatable, :lockable, :async,
          :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :registerable
  
   attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username,
@@ -398,4 +398,4 @@ class User &lt; ActiveRecord::Base
  
     self
   end
 -end
+end
 \ No newline at end of file
@@ -0,0 +1 @@
+Devise::Async.backend = :sidekiq
...	...	@@ -16,6 +16,7 @@ gem "pg", group: :postgres
16	16
17	17	# Auth
18	18	gem "devise", '~> 2.2'
	19	+gem "devise-async"
19	20	gem 'omniauth', "~> 1.1.3"
20	21	gem 'omniauth-google-oauth2'
21	22	gem 'omniauth-twitter'
...	...
...	...	@@ -106,6 +106,8 @@ GEM
106	106	orm_adapter (~> 0.1)
107	107	railties (~> 3.1)
108	108	warden (~> 1.2.1)
	109	+ devise-async (0.8.0)
	110	+ devise (>= 2.2, < 3.2)
109	111	diff-lcs (1.2.4)
110	112	dotenv (0.8.0)
111	113	email_spec (1.4.0)
...	...	@@ -564,6 +566,7 @@ DEPENDENCIES
564	566	d3_rails (~> 3.1.4)
565	567	database_cleaner
566	568	devise (~> 2.2)
	569	+ devise-async
567	570	email_spec
568	571	enumerize
569	572	factory_girl_rails
...	...
...	...	@@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord'
42	42	require 'file_size_validator'
43	43
44	44	class User < ActiveRecord::Base
45		- devise :database_authenticatable, :token_authenticatable, :lockable,
	45	+ devise :database_authenticatable, :token_authenticatable, :lockable, :async,
46	46	:recoverable, :rememberable, :trackable, :validatable, :omniauthable, :registerable
47	47
48	48	attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username,
...	...	@@ -398,4 +398,4 @@ class User < ActiveRecord::Base
398	398
399	399	self
400	400	end
401	401	-end
	402	+end
402	403	\ No newline at end of file
...	...