diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-08-19 19:07:02 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-08-19 19:49:12 -0500 |
commit | 97dddf39cd98d49f02b9adae3b7aeb3b28c434a6 (patch) | |
tree | d37b19516aec51cdbaae153111945acebf928917 /app | |
parent | c711fe15dd2409161702f20a1ccffd861ae798ab (diff) | |
download | gitlab-ce-97dddf39cd98d49f02b9adae3b7aeb3b28c434a6.tar.gz |
Disable “issue by email” feature until it uses a different token
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index f9c48a546e6..1855760e694 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -611,7 +611,10 @@ class Project < ActiveRecord::Base end def new_issue_address(author) - if Gitlab::IncomingEmail.enabled? && author + # This feature is disabled for the time being. + return nil + + if Gitlab::IncomingEmail.enabled? && author # rubocop:disable Lint/UnreachableCode Gitlab::IncomingEmail.reply_address( "#{path_with_namespace}+#{author.authentication_token}") end |