From 334fbbddf87035e8f6da72540f914c49ec1c2479 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 30 Jun 2020 15:39:27 +0800 Subject: [PATCH 1/5] change user --- app/controllers/pull_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index a727adfe2..097bfc5c4 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -69,7 +69,7 @@ class PullRequestsController < ApplicationController local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save @requests_params.merge!(head: "#{params[:merge_user_login]}:#{params[:head]}") if local_requests.is_original && params[:merge_user_login] - gitea_request = Gitea::PullRequest::CreateService.new(@project.owner.try(:gitea_token), @project.owner, @repository.try(:identifier), @requests_params).call + gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), @requests_params).call if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"]) if params[:issue_tag_ids].present? params[:issue_tag_ids].each do |tag| From ad8f8996f319ad9a0fae3e13e1a60f7cc945b9b9 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 30 Jun 2020 18:49:15 +0800 Subject: [PATCH 2/5] change some bugs --- app/controllers/pull_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 7e29c126d..f7a6ce76b 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -174,7 +174,7 @@ class PullRequestsController < ApplicationController end def show - @user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || current_user.admin? ) + @user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || @project.user_id == current_user.id || @project.manager?(current_user) ) @issue_user = @issue.user @issue_assign_to = @issue.get_assign_user From 2ffeecf6f3eff740e9739b4b28b68da4ecaacd9a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 1 Jul 2020 10:06:52 +0800 Subject: [PATCH 3/5] change tags error --- app/services/projects/fork_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb index f2cdca409..3efd3e43c 100644 --- a/app/services/projects/fork_service.rb +++ b/app/services/projects/fork_service.rb @@ -21,6 +21,7 @@ class Projects::ForkService < ApplicationService new_repository = clone_project.repository new_repository.user = @target_owner + new_repository.identifier = @project.identifier new_repository.save! result = Gitea::Repository::ForkService.new(@project.owner, @target_owner, @project.identifier, @organization).call From dae013d386f01436fc1d4df6265433d55bfd0cb7 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 2 Jul 2020 10:12:55 +0800 Subject: [PATCH 4/5] change readme content --- app/helpers/repositories_helper.rb | 6 ++++++ app/views/repositories/_simple_entry.json.jbuilder | 2 +- app/views/repositories/entries.json.jbuilder | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 19ef7f9de..2b6d9d405 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -14,6 +14,12 @@ module RepositoriesHelper default_type.include?(str&.downcase) end + def is_readme_type?(str) + return false if str.blank? + readme_types = ["readme.md", "readme", "readme_en.md", "readme_zh.md", "readme_en", "readme_zh"] + readme_types.include?(str.to_s.downcase) + end + def render_commit_author(author_json) return nil if author_json.blank? find_user_by_login author_json['login'] diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index cdea42c8b..4890f4047 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -12,7 +12,7 @@ json.target entry['target'] json.download_url entry['download_url'] json.direct_download direct_download json.image_type image_type - +json.is_readme_file is_readme_type?(file_name) if entry['latest_commit'] json.partial! 'last_commit', entry: entry end diff --git a/app/views/repositories/entries.json.jbuilder b/app/views/repositories/entries.json.jbuilder index 7c7b5ef70..7b2c7c6e6 100644 --- a/app/views/repositories/entries.json.jbuilder +++ b/app/views/repositories/entries.json.jbuilder @@ -18,12 +18,15 @@ json.entries do json.type entry['type'] json.size entry['size'] content = - if entry['name'] === 'README.md' + if is_readme_type?(entry['name']) + is_readme_file = true content = Gitea::Repository::Entries::GetService.call(@project_owner, @project.identifier, entry['name'], ref: @ref)['content'] readme_render_decode64_content(content, @path) else + is_readme_file = false entry['content'] end + json.is_readme_file is_readme_file json.content content json.target entry['target'] if entry['latest_commit'] From 7e99c0fc888c92542c9c26ae22154de1db9a2f06 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 2 Jul 2020 15:00:17 +0800 Subject: [PATCH 5/5] change some bug --- app/controllers/application_controller.rb | 1 - app/controllers/repositories_controller.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 994c6357c..42f8101e1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -386,7 +386,6 @@ class ApplicationController < ActionController::Base else User.current end - # User.current end ## 默认输出json diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 59699c27b..65c2f404c 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -97,7 +97,7 @@ class RepositoriesController < ApplicationController end def sync_mirror - return render_error("正在镜像中..") if @repo.mirror.warning? + return render_error("正在镜像中..") if @repo.mirror.waiting? @repo.sync_mirror! SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)