Fix committer typo
This commit is contained in:
parent
3d8ae6a857
commit
f611493912
5 changed files with 12 additions and 7 deletions
|
@ -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 }
|
||||
|
|
5
changelogs/unreleased/fix-committer-typo.yml
Normal file
5
changelogs/unreleased/fix-committer-typo.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix committer typo
|
||||
merge_request: 21899
|
||||
author: George Tsiolis
|
||||
type: other
|
|
@ -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: '')
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in a new issue