Commit 1c8ce323 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Only return the address if incoming emails is enabled:

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12669123
parent 3c55f1a39584
......@@ -529,8 +529,10 @@
end
def new_issue_address(author)
Gitlab::IncomingEmail.reply_address(
"#{path_with_namespace}+#{author.authentication_token}")
if Gitlab::IncomingEmail.enabled?
Gitlab::IncomingEmail.reply_address(
"#{path_with_namespace}+#{author.authentication_token}")
end
end
def build_commit_note(commit)
......
......@@ -130,10 +130,6 @@
end
describe "#new_issue_address" do
before do
stub_incoming_email_setting(address: "p+%{key}@gl.ab")
end
let(:project) { create(:empty_project, path: "somewhere") }
let(:user) { create(:user) }
......@@ -137,7 +133,12 @@
let(:project) { create(:empty_project, path: "somewhere") }
let(:user) { create(:user) }
it 'returns the address to create a new issue' do
token = user.authentication_token
address = "p+#{project.namespace.path}/#{project.path}+#{token}@gl.ab"
context 'incoming email enabled' do
before do
stub_incoming_email_setting(enabled: true, address: "p+%{key}@gl.ab")
end
it 'returns the address to create a new issue' do
token = user.authentication_token
address = "p+#{project.namespace.path}/#{project.path}+#{token}@gl.ab"
......@@ -143,5 +144,16 @@
expect(project.new_issue_address(user)).to eq(address)
expect(project.new_issue_address(user)).to eq(address)
end
end
context 'incoming email disabled' do
before do
stub_incoming_email_setting(enabled: false)
end
it 'returns nil' do
expect(project.new_issue_address(user)).to be_nil
end
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment