def new_issue_email(recipient_id, issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
- mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title))
+ mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.iid}", @issue.title))
end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
@issue = Issue.find(issue_id)
@previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
@project = @issue.project
- mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title))
+ mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.iid}", @issue.title))
end
def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
@project = @issue.project
@updated_by = User.find updated_by_user_id
mail(to: recipient(recipient_id),
- subject: subject("Closed issue ##{@issue.id}", @issue.title))
+ subject: subject("Closed issue ##{@issue.iid}", @issue.title))
end
def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@project = @issue.project
@updated_by = User.find updated_by_user_id
mail(to: recipient(recipient_id),
- subject: subject("changed issue ##{@issue.id}", @issue.title))
+ subject: subject("changed issue ##{@issue.iid}", @issue.title))
end
end
end
module MergeRequests
def new_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
- mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
+ mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.iid}", @merge_request.title))
end
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
@merge_request = MergeRequest.find(merge_request_id)
@previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
- mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title))
+ mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.iid}", @merge_request.title))
end
def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@merge_request = MergeRequest.find(merge_request_id)
@updated_by = User.find updated_by_user_id
- mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.id}", @merge_request.title))
+ mail(to: recipient(recipient_id), subject: subject("Closed merge request !#{@merge_request.iid}", @merge_request.title))
end
def merged_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
- mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.id}", @merge_request.title))
+ mail(to: recipient(recipient_id), subject: subject("Accepted merge request !#{@merge_request.iid}", @merge_request.title))
end
end
it_behaves_like 'an assignee email'
it 'has the correct subject' do
- should have_subject /#{project.name} \| new issue ##{issue.id} \| #{issue.title}/
+ should have_subject /#{project.name} \| new issue ##{issue.iid} \| #{issue.title}/
end
it 'contains a link to the new issue' do
it_behaves_like 'a multiple recipients email'
it 'has the correct subject' do
- should have_subject /changed issue ##{issue.id} \| #{issue.title}/
+ should have_subject /changed issue ##{issue.iid} \| #{issue.title}/
end
it 'contains the name of the previous assignee' do
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
it 'has the correct subject' do
- should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
+ should have_subject /changed issue ##{issue.iid} \| #{issue.title}/i
end
it 'contains the new status' do
it_behaves_like 'an assignee email'
it 'has the correct subject' do
- should have_subject /new merge request !#{merge_request.id}/
+ should have_subject /new merge request !#{merge_request.iid}/
end
it 'contains a link to the new merge request' do
it_behaves_like 'a multiple recipients email'
it 'has the correct subject' do
- should have_subject /changed merge request !#{merge_request.id}/
+ should have_subject /changed merge request !#{merge_request.iid}/
end
it 'contains the name of the previous assignee' do