Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f6114939
Commit
f6114939
authored
Sep 25, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix committer typo
parent
3d8ae6a8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
changelogs/unreleased/fix-committer-typo.yml
changelogs/unreleased/fix-committer-typo.yml
+5
-0
spec/helpers/commits_helper_spec.rb
spec/helpers/commits_helper_spec.rb
+1
-1
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+4
-4
spec/services/merge_requests/rebase_service_spec.rb
spec/services/merge_requests/rebase_service_spec.rb
+1
-1
No files found.
app/views/projects/commits/_commit.html.haml
View file @
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
.commit
t
er
-
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
}
...
...
changelogs/unreleased/fix-committer-typo.yml
0 → 100644
View file @
f6114939
---
title
:
Fix committer typo
merge_request
:
21899
author
:
George Tsiolis
type
:
other
spec/helpers/commits_helper_spec.rb
View file @
f6114939
...
@@ -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 commit
t
er 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:
''
)
...
...
spec/models/commit_spec.rb
View file @
f6114939
...
@@ -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
(
:commit
t
er
)
{
create
:user
}
before
do
before
do
project
.
add_developer
(
commiter
)
project
.
add_developer
(
commit
t
er
)
other_project
.
add_developer
(
commiter
)
other_project
.
add_developer
(
commit
t
er
)
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:
commit
t
er
.
email
)
)
expect
(
commit
.
closes_issues
).
to
include
(
issue
)
expect
(
commit
.
closes_issues
).
to
include
(
issue
)
...
...
spec/services/merge_requests/rebase_service_spec.rb
View file @
f6114939
...
@@ -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 commit
t
er'
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'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment