Skip to content

Commit

Permalink
Merge 36c9db2 into 0c2c835
Browse files Browse the repository at this point in the history
  • Loading branch information
atruskie committed Mar 21, 2016
2 parents 0c2c835 + 36c9db2 commit ef377f3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/analysis_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def file_info(path)
path: normalised_path,
name: normalised_name,
type: 'file',
size: File.size(path),
size_bytes: File.size(path),
mime: Mime::Type.lookup_by_extension(File.extname(path)[1..-1]).to_s
}
end
Expand Down Expand Up @@ -292,4 +292,4 @@ def return_dir(request_info)
end


end
end

0 comments on commit ef377f3

Please sign in to comment.