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
501ca8e6
Commit
501ca8e6
authored
Jul 25, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compare crash after decorator refactoring
parent
0296121f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+2
-0
app/views/commits/compare.html.haml
app/views/commits/compare.html.haml
+3
-2
No files found.
app/controllers/commits_controller.rb
View file @
501ca8e6
...
@@ -52,6 +52,8 @@ class CommitsController < ApplicationController
...
@@ -52,6 +52,8 @@ class CommitsController < ApplicationController
@commit
=
result
[
:commit
]
@commit
=
result
[
:commit
]
@diffs
=
result
[
:diffs
]
@diffs
=
result
[
:diffs
]
@line_notes
=
[]
@line_notes
=
[]
@commits
=
CommitDecorator
.
decorate
(
@commits
)
end
end
def
patch
def
patch
...
...
app/views/commits/compare.html.haml
View file @
501ca8e6
...
@@ -24,8 +24,9 @@
...
@@ -24,8 +24,9 @@
-
unless
@commits
.
empty?
-
unless
@commits
.
empty?
%h4
Commits (
#{
@commits
.
count
}
)
%div
.ui-box
%ul
.unstyled
=
render
@commits
%h5
.small
Commits (
#{
@commits
.
count
}
)
%ul
.unstyled
=
render
@commits
-
unless
@diffs
.
empty?
-
unless
@diffs
.
empty?
%h4
Diff
%h4
Diff
...
...
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