diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-20 04:29:11 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-20 05:54:34 +0300 |
| commit | b591304061773a8164ff3afd5a99d69f25741833 (patch) | |
| tree | c727659cf4edbfe1b721d7e848538cd4bb2e40b1 /app | |
| parent | be294efd8fa6dbe534af1f974b03caab3467a2f9 (diff) | |
Merge branch 'disable-issue-by-email' into 'master'
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
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 |