Commit 4ca1afec authored by Rémy Coutable's avatar Rémy Coutable

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

Fix committer typo

Closes #51808

See merge request gitlab-org/gitlab-ce!21899
parents bced03c8 f6114939
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
%button.text-expander.js-toggle-button %button.text-expander.js-toggle-button
= sprite_icon('ellipsis_h', size: 12) = sprite_icon('ellipsis_h', size: 12)
.commiter .committer
- commit_author_link = commit_author_link(commit, avatar: false, size: 24) - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
- commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom') - 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 } - commit_text = _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago }
......
---
title: Fix committer typo
merge_request: 21899
author: George Tsiolis
type: other
...@@ -37,7 +37,7 @@ describe CommitsHelper do ...@@ -37,7 +37,7 @@ describe CommitsHelper do
.not_to include('onmouseover="alert(1)"') .not_to include('onmouseover="alert(1)"')
end end
it 'escapes the commiter name' do it 'escapes the committer name' do
user = build_stubbed(:user, name: 'Foo <script>alert("XSS")</script>') user = build_stubbed(:user, name: 'Foo <script>alert("XSS")</script>')
commit = double(committer: user, committer_name: '', committer_email: '') commit = double(committer: user, committer_name: '', committer_email: '')
......
...@@ -270,11 +270,11 @@ eos ...@@ -270,11 +270,11 @@ eos
let(:issue) { create :issue, project: project } let(:issue) { create :issue, project: project }
let(:other_project) { create(:project, :public) } let(:other_project) { create(:project, :public) }
let(:other_issue) { create :issue, project: other_project } let(:other_issue) { create :issue, project: other_project }
let(:commiter) { create :user } let(:committer) { create :user }
before do before do
project.add_developer(commiter) project.add_developer(committer)
other_project.add_developer(commiter) other_project.add_developer(committer)
end end
it 'detects issues that this commit is marked as closing' do it 'detects issues that this commit is marked as closing' do
...@@ -282,7 +282,7 @@ eos ...@@ -282,7 +282,7 @@ eos
allow(commit).to receive_messages( allow(commit).to receive_messages(
safe_message: "Fixes ##{issue.iid} and #{ext_ref}", safe_message: "Fixes ##{issue.iid} and #{ext_ref}",
committer_email: commiter.email committer_email: committer.email
) )
expect(commit.closes_issues).to include(issue) expect(commit.closes_issues).to include(issue)
......
...@@ -87,7 +87,7 @@ describe MergeRequests::RebaseService do ...@@ -87,7 +87,7 @@ describe MergeRequests::RebaseService do
expect(merge_request.reload.rebase_commit_sha).to eq(head_sha) expect(merge_request.reload.rebase_commit_sha).to eq(head_sha)
end 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) head_commit = merge_request.source_project.repository.commit(merge_request.source_branch)
expect(head_commit.author_email).to eq('dmitriy.zaporozhets@gmail.com') expect(head_commit.author_email).to eq('dmitriy.zaporozhets@gmail.com')
......
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