From 0211d6152e362a08fb6fdc4926ff064d076a4052 Mon Sep 17 00:00:00 2001 From: jasder Date: Sun, 28 Mar 2021 19:56:11 +0800 Subject: [PATCH 1/2] fix conflict --- app/controllers/projects_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c073d5846..93b6dc3bd 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,14 +11,14 @@ class ProjectsController < ApplicationController menu = [] menu.append(menu_hash_by_name("home")) - menu.append(menu_hash_by_name("code")) + menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code") menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues") menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions") menu.append(menu_hash_by_name("activity")) menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.owner?(current_user) - + render json: menu end @@ -59,7 +59,10 @@ class ProjectsController < ApplicationController end def branches - @branches = @project.forge? ? Gitea::Repository::Branches::ListService.new(@owner, @project.identifier).call : [] + return @branches = [] unless @project.forge? + + result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier) + @branches = result.is_a?(Hash) && result.key?(:status) ? [] : result end def group_type_list @@ -86,7 +89,7 @@ class ProjectsController < ApplicationController ActiveRecord::Base.transaction do # Projects::CreateForm.new(project_params).validate! private = params[:private] || false - + new_project_params = project_params.except(:private).merge(is_public: !private) @project.update_attributes!(new_project_params) gitea_params = { From c4560ebb664d4fbb8cfe9210b6d66003e2295776 Mon Sep 17 00:00:00 2001 From: jasder Date: Sun, 28 Mar 2021 20:05:13 +0800 Subject: [PATCH 2/2] FIX tags api bug --- app/controllers/repositories_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index f4dd3c8f0..10b352ae6 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -103,7 +103,9 @@ class RepositoriesController < ApplicationController end def tags - @tags = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]}) + result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]}) + + @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result end def contributors