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
Boxiang Sun
gitlab-ce
Commits
9159be3a
Commit
9159be3a
authored
Sep 15, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR diff comments. Fix wiki comments loading error
parent
caeb65b1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+2
-2
app/contexts/notes/load_context.rb
app/contexts/notes/load_context.rb
+1
-1
app/models/project.rb
app/models/project.rb
+4
-0
app/models/wiki.rb
app/models/wiki.rb
+0
-1
app/views/merge_requests/diffs.html.haml
app/views/merge_requests/diffs.html.haml
+4
-0
No files found.
app/assets/stylesheets/sections/notes.scss
View file @
9159be3a
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
border-top
:
1px
solid
#aaa
;
border-top
:
1px
solid
#aaa
;
}
}
#new-notes-list
.reversed
{
#new-notes-list
.reversed
{
border-bottom
:
1px
solid
#
aaa
;
border-bottom
:
1px
solid
#
ccc
;
}
}
.issue_notes
,
.issue_notes
,
...
@@ -227,7 +227,7 @@ td .line_note_link {
...
@@ -227,7 +227,7 @@ td .line_note_link {
}
}
}
}
.note-text
{
.note-text
{
border
:
1px
solid
#aaa
;
border
:
1px
solid
#aaa
;
box-shadow
:none
;
box-shadow
:none
;
}
}
app/contexts/notes/load_context.rb
View file @
9159be3a
...
@@ -20,7 +20,7 @@ module Notes
...
@@ -20,7 +20,7 @@ module Notes
# this is the only case, where the order is DESC
# this is the only case, where the order is DESC
project
.
common_notes
.
order
(
"created_at DESC, id DESC"
).
limit
(
50
)
project
.
common_notes
.
order
(
"created_at DESC, id DESC"
).
limit
(
50
)
when
"wiki"
when
"wiki"
project
.
wiki
s
.
reverse
.
map
{
|
w
|
w
.
notes
.
fresh
}.
flatten
[
0
..
20
]
project
.
wiki
_notes
.
limit
(
20
)
end
end
@notes
=
if
after_id
@notes
=
if
after_id
...
...
app/models/project.rb
View file @
9159be3a
...
@@ -171,6 +171,10 @@ class Project < ActiveRecord::Base
...
@@ -171,6 +171,10 @@ class Project < ActiveRecord::Base
end
end
end
end
def
wiki_notes
Note
.
where
(
noteable_id:
wikis
.
map
(
&
:id
),
noteable_type:
'Wiki'
,
project_id:
self
.
id
)
end
def
project_id
def
project_id
self
.
id
self
.
id
end
end
...
...
app/models/wiki.rb
View file @
9159be3a
...
@@ -28,7 +28,6 @@ class Wiki < ActiveRecord::Base
...
@@ -28,7 +28,6 @@ class Wiki < ActiveRecord::Base
end
end
new_wiki
new_wiki
end
end
end
end
end
end
# == Schema Information
# == Schema Information
...
...
app/views/merge_requests/diffs.html.haml
View file @
9159be3a
=
render
"show"
=
render
"show"
:javascript
$
(
function
(){
PerLineNotes
.
init
();
});
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