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
Tatuya Kamada
gitlab-ce
Commits
7335f366
Commit
7335f366
authored
Jan 02, 2013
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comment and reply buttons
parent
db2c1536
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
1 deletion
+4
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+1
-0
app/controllers/commit_controller.rb
app/controllers/commit_controller.rb
+1
-1
app/views/notes/_diff_note_link.html.haml
app/views/notes/_diff_note_link.html.haml
+1
-0
app/views/notes/_discussion_reply_button.html.haml
app/views/notes/_discussion_reply_button.html.haml
+1
-0
No files found.
app/assets/javascripts/notes.js
View file @
7335f366
...
...
@@ -244,6 +244,7 @@ var NoteList = {
setupDiscussionNoteForm
:
function
(
dataHolder
,
form
)
{
// setup note target
form
.
attr
(
"
rel
"
,
dataHolder
.
data
(
"
discussionId
"
));
form
.
find
(
"
#note_commit_id
"
).
val
(
dataHolder
.
data
(
"
commitId
"
));
form
.
find
(
"
#note_line_code
"
).
val
(
dataHolder
.
data
(
"
lineCode
"
));
form
.
find
(
"
#note_noteable_type
"
).
val
(
dataHolder
.
data
(
"
noteableType
"
));
form
.
find
(
"
#note_noteable_id
"
).
val
(
dataHolder
.
data
(
"
noteableId
"
));
...
...
app/controllers/commit_controller.rb
View file @
7335f366
...
...
@@ -23,7 +23,7 @@ class CommitController < ProjectResourceController
@comments_allowed
=
@reply_allowed
=
true
@comments_target
=
{
noteable_type:
'Commit'
,
noteable
_id:
@commit
.
id
}
commit
_id:
@commit
.
id
}
respond_to
do
|
format
|
format
.
html
do
...
...
app/views/notes/_diff_note_link.html.haml
View file @
7335f366
...
...
@@ -4,6 +4,7 @@
class:
"add-diff-note js-add-diff-note-button"
,
data:
{
noteable_type:
note
.
noteable_type
,
noteable_id:
note
.
noteable_id
,
commit_id:
note
.
commit_id
,
line_code:
note
.
line_code
,
discussion_id:
note
.
discussion_id
},
title:
"Add a comment to this line"
app/views/notes/_discussion_reply_button.html.haml
View file @
7335f366
...
...
@@ -2,6 +2,7 @@
class:
"btn reply-btn js-discussion-reply-button"
,
data:
{
noteable_type:
note
.
noteable_type
,
noteable_id:
note
.
noteable_id
,
commit_id:
note
.
commit_id
,
line_code:
note
.
line_code
,
discussion_id:
note
.
discussion_id
},
title:
"Add a reply"
do
...
...
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