deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed encoding issue for diff. Reordered merge request commits

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-15 00:41:36 +02:00
parent 65e4ad3147
commit ef396d08fc
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/merge_requests_controller.rb
View file

@ -49,7 +49,11 @@ class MergeRequestsController < ApplicationController
end
def commits
@commits = @project.repo.commits_between(@merge_request.target_branch, @merge_request.source_branch).map {|c| Commit.new(c)}
@commits = @project.repo.
commits_between(@merge_request.target_branch, @merge_request.source_branch).
map {|c| Commit.new(c)}.
sort_by(&:created_at).
reverse
end
def diffs