Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

app/interactors/gitea/create_file_interactor.rb

@@ -53,7 +53,7 @@ module Gitea
 
     def file_params
       file_params = {}
-      file_params = file_params.merge(branch: @params[:branch]) unless @params[:branch].blank?
+      file_params = file_params.merge(branch: @params[:branch]) unless (@params[:branch].blank? || @params[:new_branch].present?)
       file_params = file_params.merge(new_branch: @params[:new_branch]) unless @params[:new_branch].blank?
       file_params = file_params.merge(content: Base64.encode64(@params[:content]))
       file_params = file_params.merge(message: @params[:message]) unless @params[:message].blank?

app/views/projects/_project_detail.json.jbuilder

@@ -12,6 +12,7 @@ json.praises_count project.praises_count.to_i
 json.forked_count project.forked_count.to_i
 json.is_public project.is_public
 json.mirror_url project.repository&.mirror_url
+json.type project.numerical_for_project_type
 json.last_update_time render_unix_time(project.updated_on)
 json.time_ago time_from_now(project.updated_on)
 json.forked_from_project_id project.forked_from_project_id