Skip to content
Snippets Groups Projects
Commit ef396d08 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fixed encoding issue for diff. Reordered merge request commits

parent 65e4ad31
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -58,7 +58,7 @@ module CommitsHelper
next if line.match(/^\-\-\- a/)
next if line.match(/^\+\+\+ b/)
 
full_line = html_escape(line.gsub(/\n/, ''))
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8")
 
if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1
Loading
Loading
.file_stats
= render "commits/diff_head", :diffs => diffs
- diffs.each_with_index do |diff, i|
- next if diff.diff.empty?
- file = (@commit.tree / diff.b_path)
Loading
Loading
@@ -16,7 +16,7 @@
%br/
.diff_file_content
- if file.text?
= render :partial => "commits/text_file", :locals => { :diff => diff, :index => i }
= render "commits/text_file", :diff => diff, :index => i
- elsif file.image?
.diff_file_content_image
%img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment