Commit 3b0277fb authored by Douwe Maan's avatar Douwe Maan

Merge branch 'jramsay-fix-incorrect-mirror-role-name' into 'master'

Fix incorrect role name in mirroring error

See merge request gitlab-org/gitlab-ee!4468
parents b69b71d6 250f1cde
......@@ -9,7 +9,7 @@
- if @project.mirror_hard_failed?
%br
Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project admin.
Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project master.
- if @project.mirror_ever_updated_successfully?
%br
......
......@@ -56,7 +56,7 @@ describe 'shared/_mirror_status.html.haml' do
render 'shared/mirror_status', raw_message: true
expect(rendered).to have_content("Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project admin.")
expect(rendered).to have_content("Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project master.")
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