From b591304061773a8164ff3afd5a99d69f25741833 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 20 Aug 2016 01:29:11 +0000 Subject: Merge branch 'disable-issue-by-email' into 'master' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable “issue by email” feature until it uses a different token Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11. See merge request !5915 --- app/models/project.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app') 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 -- cgit v1.2.3