Merge branch 'fix-committer-typo' into 'master'

Fix committer typo

Closes #51808

See merge request gitlab-org/gitlab-ce!21899

5 files changed, 12 insertions, 7 deletions

diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 7951a5ddc9e..45b4f03fa0c 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -37,7 +37,7 @@
           %button.text-expander.js-toggle-button
             = sprite_icon('ellipsis_h', size: 12)
 
-        .commiter
+        .committer
           - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
           - commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom')
           - commit_text =  _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago }
diff --git a/changelogs/unreleased/fix-committer-typo.yml b/changelogs/unreleased/fix-committer-typo.yml
new file mode 100644
index 00000000000..6033912b6c0
--- /dev/null
+++ b/changelogs/unreleased/fix-committer-typo.yml
@@ -0,0 +1,5 @@
+---
+title: Fix committer typo
+merge_request: 21899
+author: George Tsiolis
+type: other
diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb
index 4b6c7c33e5b..9c0e55739d6 100644
--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -37,7 +37,7 @@ describe CommitsHelper do
         .not_to include('onmouseover="alert(1)"')
     end
 
-    it 'escapes the commiter name' do
+    it 'escapes the committer name' do
       user = build_stubbed(:user, name: 'Foo <script>alert("XSS")</script>')
 
       commit = double(committer: user, committer_name: '', committer_email: '')
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index a6957095166..ed41ff7a0fa 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -270,11 +270,11 @@ eos
     let(:issue) { create :issue, project: project }
     let(:other_project) { create(:project, :public) }
     let(:other_issue) { create :issue, project: other_project }
-    let(:commiter) { create :user }
+    let(:committer) { create :user }
 
     before do
-      project.add_developer(commiter)
-      other_project.add_developer(commiter)
+      project.add_developer(committer)
+      other_project.add_developer(committer)
     end
 
     it 'detects issues that this commit is marked as closing' do
@@ -282,7 +282,7 @@ eos
 
       allow(commit).to receive_messages(
         safe_message: "Fixes ##{issue.iid} and #{ext_ref}",
-        committer_email: commiter.email
+        committer_email: committer.email
       )
 
       expect(commit.closes_issues).to include(issue)
diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb
index 2703da7ae44..427a2d63a88 100644
--- a/spec/services/merge_requests/rebase_service_spec.rb
+++ b/spec/services/merge_requests/rebase_service_spec.rb
@@ -87,7 +87,7 @@ describe MergeRequests::RebaseService do
           expect(merge_request.reload.rebase_commit_sha).to eq(head_sha)
         end
 
-        it 'logs correct author and commiter' do
+        it 'logs correct author and committer' do
           head_commit = merge_request.source_project.repository.commit(merge_request.source_branch)
 
           expect(head_commit.author_email).to eq('dmitriy.zaporozhets@gmail.com')