Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #90] fixed error by 24fd99b2d5cab

This commit is contained in:
Alexander Machehin 2012-10-18 18:50:43 +06:00
parent e15bf13c4f
commit c6f45956cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/pull_requests_controller.rb
View File

@ -128,7 +128,7 @@ class Projects::PullRequestsController < Projects::BaseController
end end
def load_diff_commits_data def load_diff_commits_data
@commits = @pull.repo.commits_between(@pull.from_commit, @pull.to_commit) @commits = @pull.repo.commits_between(@pull.to_commit, @pull.from_commit)
@total_commits = @commits.count @total_commits = @commits.count
@commits = @commits.last(100) @commits = @commits.last(100)

2
app/views/projects/pull_requests/_pull_diff.html.haml
View File

@ -1,4 +1,4 @@
- commit_id = pull_diff.deleted_file ? @base_commit.id : @head_commit.id - commit_id = pull_diff.deleted_file ? @pull.to_commit.id : @pull.from_commit.id
.file .file
%a{:name => "diff-#{pull_diff_counter}"} %a{:name => "diff-#{pull_diff_counter}"}
.top .top