Merge branch 'standalone_develop' into pre_trustie_server

app/helpers/repositories_helper.rb

@@ -10,7 +10,7 @@ module RepositoriesHelper
   end
 
   def download_type(str)
-    default_type = %w(ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv apk)
+    default_type = %w(ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv apk xlsx xls)
     default_type.include?(str&.downcase) || str.blank?
   end
 
@@ -91,7 +91,7 @@ module RepositoriesHelper
               new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{path_current}/#{path_last}&ref=#{ref}"].join
             end
             content = content.gsub(/src=\"#{r_content}\"/, "src=\"#{new_r_content}\"").gsub(/src='#{r_content}'/, "src=\"#{new_r_content}\"")
-          rescue 
+          rescue
             next
           end
         end

app/views/repositories/_simple_entry.json.jbuilder

@@ -2,7 +2,7 @@ if @project.forge?
   is_dir = @sub_entries.is_a?(Array)
   file_name = entry['name']
   file_type = File.extname(file_name.to_s)[1..-1]
-  direct_download = download_type(file_type)
+  direct_download = file_name.to_s.downcase != "Makefile".downcase && download_type(file_type)
   image_type = image_type?(file_type)
   json.name file_name
   json.sha entry['sha']