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
16a98387
Commit
16a98387
authored
Jan 23, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge reques diff: files list displayed
parent
5c6417ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
app/views/commits/_diff.html.haml
app/views/commits/_diff.html.haml
+1
-1
app/views/commits/_diff_head.html.haml
app/views/commits/_diff_head.html.haml
+1
-1
app/views/merge_requests/_diffs.html.haml
app/views/merge_requests/_diffs.html.haml
+2
-0
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+1
-2
No files found.
app/views/commits/_diff.html.haml
View file @
16a98387
.file_stats
.file_stats
=
render
"commits/diff_head"
=
render
"commits/diff_head"
,
:diffs
=>
@commit
.
diffs
-
@commit
.
diffs
.
each_with_index
do
|
diff
,
i
|
-
@commit
.
diffs
.
each_with_index
do
|
diff
,
i
|
-
next
if
diff
.
diff
.
empty?
-
next
if
diff
.
diff
.
empty?
...
...
app/views/commits/_diff_head.html.haml
View file @
16a98387
%ul
.bordered-list
%ul
.bordered-list
-
@commit
.
diffs
.
each
do
|
diff
|
-
diffs
.
each
do
|
diff
|
%li
%li
-
if
diff
.
deleted_file
-
if
diff
.
deleted_file
%span
.removed_file
%span
.removed_file
...
...
app/views/merge_requests/_diffs.html.haml
View file @
16a98387
.file_stats
=
render
"commits/diff_head"
,
:diffs
=>
@diffs
-
@diffs
.
each_with_index
do
|
diff
,
i
|
-
@diffs
.
each_with_index
do
|
diff
,
i
|
-
next
if
diff
.
diff
.
empty?
-
next
if
diff
.
diff
.
empty?
-
file
=
(
@commit
.
tree
/
diff
.
b_path
)
-
file
=
(
@commit
.
tree
/
diff
.
b_path
)
...
...
app/views/notes/_form.html.haml
View file @
16a98387
...
@@ -19,8 +19,7 @@
...
@@ -19,8 +19,7 @@
%br
%br
=
f
.
label
:attachment
=
f
.
label
:attachment
%cite
.cgray
(less than 10 MB)
%cite
.cgray
(less than 10 MB)
%br
%br
=
f
.
file_field
:attachment
=
f
.
file_field
:attachment
%p
.notify_controls
%p
.notify_controls
...
...
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