Merge branch 'dev_trustie' into dev_chain

app/controllers/repositories_controller.rb

@@ -28,7 +28,7 @@ class RepositoriesController < ApplicationController
     @project.increment!(:visits)
     @project_owner = @project.owner
     @entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call
-    @entries = @entries["status"].to_i == 1 ? @entries.sort_by{ |hash| hash['type'] } : []
+    @entries = @entries["status"].to_i != -1 ? @entries.sort_by{ |hash| hash['type'] } : []
     @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
   end
 

app/services/gitea/repository/entries/list_service.rb

@@ -27,7 +27,7 @@ class Gitea::Repository::Entries::ListService < Gitea::ClientService
     body = JSON.parse(response.body)
     case response.status
     when 200
-      body.merge!({"status": 1})
+      body
     else
       {'status': -1, 'message': "#{body['message']}"}
     end