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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2afc9fa9
Commit
2afc9fa9
authored
Apr 27, 2020
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the misaligned avatar in commit discussion form
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/33423
parent
44b4bab3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+3
-3
app/views/shared/notes/_form.html.haml
app/views/shared/notes/_form.html.haml
+2
-2
changelogs/unreleased/ph-33423-fixCommitReplyForm.yml
changelogs/unreleased/ph-33423-fixCommitReplyForm.yml
+5
-0
No files found.
app/assets/javascripts/notes.js
View file @
2afc9fa9
...
...
@@ -964,11 +964,11 @@ export default class Notes {
form
.
prepend
(
`<
div class="avatar-note-form-holder"><div class="content"><
a href="
${
escape
(
`<a href="
${
escape
(
gon
.
current_username
,
)}
" class="user-avatar-link d-none d-sm-block"><img class="avatar s40" src="
${
encodeURI
(
gon
.
current_user_avatar_url
,
)}
" alt="
${
escape
(
gon
.
current_user_fullname
)}
" /></a>
</div></div>
`
,
gon
.
current_user_avatar_url
||
gon
.
default_avatar_url
,
)}
" alt="
${
escape
(
gon
.
current_user_fullname
)}
" /></a>`
,
)
.
append
(
'
</div>
'
)
.
find
(
'
.js-close-discussion-note-form
'
)
...
...
app/views/shared/notes/_form.html.haml
View file @
2afc9fa9
...
...
@@ -5,7 +5,7 @@
-
else
-
preview_url
=
preview_markdown_path
(
@project
)
=
form_for
form_resources
,
url:
new_form_url
,
remote:
true
,
html:
{
:'data-type'
=>
'json'
,
multipart:
true
,
id:
nil
,
class:
"new-note js-new-note-form js-quick-submit common-note-form"
,
"data-noteable-iid"
=>
@note
.
noteable
.
try
(
:iid
),
},
authenticity_token:
true
do
|
f
|
=
form_for
form_resources
,
url:
new_form_url
,
remote:
true
,
html:
{
:'data-type'
=>
'json'
,
multipart:
true
,
id:
nil
,
class:
"new-note js-new-note-form js-quick-submit common-note-form
discussion-reply-holder
"
,
"data-noteable-iid"
=>
@note
.
noteable
.
try
(
:iid
),
},
authenticity_token:
true
do
|
f
|
=
hidden_field_tag
:view
,
diff_view
=
hidden_field_tag
:line_type
=
hidden_field_tag
:merge_request_diff_head_sha
,
@note
.
noteable
.
try
(
:diff_head_sha
)
...
...
@@ -24,7 +24,7 @@
-# DiffNote
=
f
.
hidden_field
:position
.discussion-form-container
.discussion-form-container
.discussion-with-resolve-btn.flex-column.p-0
=
render
layout:
'projects/md_preview'
,
locals:
{
url:
preview_url
,
referenced_users:
true
}
do
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
...
...
changelogs/unreleased/ph-33423-fixCommitReplyForm.yml
0 → 100644
View file @
2afc9fa9
---
title
:
Fixed misaligned avatar in commit discussion form
merge_request
:
author
:
type
:
fixed
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