diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-09 20:36:51 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-09 20:36:51 +0400 |
| commit | f89a74718a0297c0be5732e829d137f1d118f5f2 (patch) | |
| tree | 24e5ef4ba3e3a9f830738a223009184cbe96a14c | |
| parent | 7af1bc3b88e3a32cb07d7aee7962af22c2339c02 (diff) | |
| parent | 92768844cf894fda2d0eb50555a78b19d00f0ce8 (diff) | |
Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/models/user.rb | 4 | ||||
| -rw-r--r-- | config/initializers/devise_async.rb | 1 |
4 files changed, 7 insertions, 2 deletions
@@ -16,6 +16,7 @@ gem "pg", group: :postgres # Auth gem "devise", '~> 2.2' +gem "devise-async" gem 'omniauth', "~> 1.1.3" gem 'omniauth-google-oauth2' gem 'omniauth-twitter' diff --git a/Gemfile.lock b/Gemfile.lock index ce3aeb7994b..667ea9f1299 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 diff --git a/app/models/user.rb b/app/models/user.rb index 5d742578c42..29c53b88331 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -42,7 +42,7 @@ require 'carrierwave/orm/activerecord' 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 < ActiveRecord::Base self end -end +end
\ No newline at end of file diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb new file mode 100644 index 00000000000..05a1852cdbd --- /dev/null +++ b/config/initializers/devise_async.rb @@ -0,0 +1 @@ +Devise::Async.backend = :sidekiq |