Commit f7c22b83 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rs-committer-verified-email' into 'master'

Fix typo in `push_rule_committer_not_verified` interpolation

Closes #6186

See merge request gitlab-org/gitlab-ee!5843
parents 2b3d1fe4 2e146044
......@@ -9,7 +9,7 @@ module EE
ERROR_MESSAGES = {
push_rule_branch_name: "Branch name does not follow the pattern '%{branch_name_regex}'",
push_rule_committer_not_verified: "Comitter email '%{commiter_email}' is not verified.",
push_rule_committer_not_verified: "Committer email '%{committer_email}' is not verified.",
push_rule_committer_not_allowed: "You cannot push commits for '%{committer_email}'. You can only push commits that were committed with one of your own verified emails."
}.freeze
......
......@@ -379,7 +379,7 @@ describe Gitlab::Checks::ChangeAccess do
expect { subject.exec }
.to raise_error(Gitlab::GitAccess::UnauthorizedError,
"Comitter email '%{commiter_email}' is not verified.")
"Committer email 'secondary_email@user.com' is not verified.")
end
it 'raises an error when using an unknown email' do
......
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