diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-18 19:03:31 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-07 15:56:18 +0000 |
| commit | 011e561bfa227f3ecbafe5b1ffd51700c680a15f (patch) | |
| tree | 58af709e0f38dbfd7d389e2c3ad5516507ca2946 /app/models/user.rb | |
| parent | 9d51421346178c9189ffb47189f51d573ab42822 (diff) | |
| download | gitlab-ce-011e561bfa227f3ecbafe5b1ffd51700c680a15f.tar.gz | |
implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email
reactivates all tests and writes more tests for it
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9a3619b0bc3..d6aeda809da 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -951,7 +951,7 @@ class User < ActiveRecord::Base def generate_token(token_field) if token_field == :incoming_email_token # Needs to be all lowercase and alphanumeric because it's gonna be used in an email address. - SecureRandom.hex + SecureRandom.hex.to_i(16).to_s(36) else super end |