summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-10-18 19:03:31 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-11-07 15:56:18 +0000
commit011e561bfa227f3ecbafe5b1ffd51700c680a15f (patch)
tree58af709e0f38dbfd7d389e2c3ad5516507ca2946 /app/models/project.rb
parent9d51421346178c9189ffb47189f51d573ab42822 (diff)
downloadgitlab-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/project.rb')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 56b84b0aebb..4c9c7c001dd 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -624,7 +624,7 @@ class Project < ActiveRecord::Base
end
def new_issue_address(author)
- return unless Gitlab::IncomingEmail.enabled? && author
+ return unless Gitlab::IncomingEmail.supports_issue_creation? && author
author.ensure_incoming_email_token!