Commit 377a33c3 authored by Douwe Maan's avatar Douwe Maan

Merge branch '5740-mirroring-paused-link-is-invalid' into 'master'

Resolve ""Repository mirroring paused" email link is invalid"

Closes #5740

See merge request gitlab-org/gitlab-ee!5546
parents a54ceb04 6aec3aa4
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
= @project.import_error = @project.import_error
%p %p
To resume mirroring update your #{link_to("repository mirroring settings", project_settings_repository_path(@project))}. To resume mirroring update your #{link_to("repository mirroring settings", project_settings_repository_url(@project))}.
---
title: Fixes invalid link in html version of mirror was hard failed email
merge_request: 5546
author:
type: fixed
...@@ -1369,6 +1369,7 @@ describe Notify do ...@@ -1369,6 +1369,7 @@ describe Notify do
it 'has the correct subject and body' do it 'has the correct subject and body' do
is_expected.to have_subject("#{project.name} | Repository mirroring paused") is_expected.to have_subject("#{project.name} | Repository mirroring paused")
is_expected.to have_html_escaped_body_text(project.full_path) is_expected.to have_html_escaped_body_text(project.full_path)
is_expected.to have_html_escaped_body_text(project_settings_repository_url(project))
end end
end end
......
Markdown is supported
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