From 3a0ec56564ca788c259c92de48b46f552819e3a7 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 11:12:04 +0800 Subject: [PATCH 01/16] Chnage --- app/jobs/sync_project_military_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index 0cf76f7a9..3afaf6b5b 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob repository: repository.as_json, project_socre: project_socre.as_json } - url = "http://47.93.212.82:49999/sync_forges" #trustie上的相关路由 + url = "http://47.93.212.82:49999/sync_forge/sync_projects" #trustie上的相关路由 uri = URI.parse(url) http = Net::HTTP.new(uri.hostname, uri.port) http.use_ssl = false From ccf2053ca4a2d0394a7bdaf6b9b893e418c2cc4c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 11:17:49 +0800 Subject: [PATCH 02/16] Change --- app/jobs/sync_project_military_job.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index 3afaf6b5b..fc0e501d8 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -6,11 +6,11 @@ class SyncProjectMilitaryJob < ApplicationJob def perform(project, repository, project_socre) Rails.logger.info("============begin to sync project ===========") - project_except_params = %w(praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count) + project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count) project_params = { project: project.as_json(except: project_except_params), - repository: repository.as_json, - project_socre: project_socre.as_json + repository: repository.as_json(except: %w(id project_id login user_id)), + project_socre: project_socre.as_json(except: %w(id project_id)) } url = "http://47.93.212.82:49999/sync_forge/sync_projects" #trustie上的相关路由 uri = URI.parse(url) From 97bec74589bd9444791e316e133d32adce095016 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 11:46:55 +0800 Subject: [PATCH 03/16] Change --- app/jobs/sync_project_military_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index fc0e501d8..e13a1503a 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob repository: repository.as_json(except: %w(id project_id login user_id)), project_socre: project_socre.as_json(except: %w(id project_id)) } - url = "http://47.93.212.82:49999/sync_forge/sync_projects" #trustie上的相关路由 + url = "http://47.93.212.82:49999/api/sync_forge/sync_projects" #trustie上的相关路由 uri = URI.parse(url) http = Net::HTTP.new(uri.hostname, uri.port) http.use_ssl = false From 01be601ed4859e9b81deebf4410ac96934ce411e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 14:55:19 +0800 Subject: [PATCH 04/16] Change --- app/jobs/sync_project_military_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index e13a1503a..51f9b8348 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob repository: repository.as_json(except: %w(id project_id login user_id)), project_socre: project_socre.as_json(except: %w(id project_id)) } - url = "http://47.93.212.82:49999/api/sync_forge/sync_projects" #trustie上的相关路由 + url = "http://39.105.176.215:49999/api/sync_forge/sync_projects" #trustie上的相关路由 uri = URI.parse(url) http = Net::HTTP.new(uri.hostname, uri.port) http.use_ssl = false From b5532c2e8a90f6800b107ca773bc73d861cf114d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 14:55:50 +0800 Subject: [PATCH 05/16] Change --- app/jobs/sync_project_military_job.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index 51f9b8348..4e62340e4 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -5,7 +5,7 @@ class SyncProjectMilitaryJob < ApplicationJob queue_as :default def perform(project, repository, project_socre) - Rails.logger.info("============begin to sync project ===========") + SyncLog.sync_log("============begin to sync project ===========") project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count) project_params = { project: project.as_json(except: project_except_params), @@ -17,6 +17,6 @@ class SyncProjectMilitaryJob < ApplicationJob http = Net::HTTP.new(uri.hostname, uri.port) http.use_ssl = false response = http.send_request('POST', uri.path, project_params.to_json, {'Content-Type' => 'application/json'}) - Rails.logger.info("============end to sync project, status: #{response.code} ===========") + SyncLog.sync_log("============end to sync project, status: #{response.code} ===========") end end From 3596ddeee4eae8f6c6b45aaae3fb7741678cb095 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 15:03:14 +0800 Subject: [PATCH 06/16] Change --- app/views/admins/shared/_sidebar.html.erb | 2 +- config/routes.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 7287c0347..de56a5477 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -41,7 +41,7 @@ <% end %>
  • - <%= sidebar_item('/sidekiq', '定时任务', icon: 'bell', controller: 'root') %> + <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
  • <%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %>
    • diff --git a/config/routes.rb b/config/routes.rb index 80ca95018..4aa1652f0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ Rails.application.routes.draw do require 'sidekiq/web' require 'admin_constraint' - mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new + # mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new # Serve websocket cable requests in-process mount ActionCable.server => '/cable' @@ -414,6 +414,7 @@ Rails.application.routes.draw do end namespace :admins do + mount Sidekiq::Web => '/sidekiq' get '/', to: 'dashboards#index' resources :project_statistics, only: [:index] do collection do From ae4161fa9bc7f43388f321b9eb2c41576bf0475f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 12 Aug 2020 16:51:24 +0800 Subject: [PATCH 07/16] Change --- app/controllers/sync_forge_controller.rb | 2 +- app/jobs/sync_project_military_job.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb index db44a3b8c..e4a593e14 100644 --- a/app/controllers/sync_forge_controller.rb +++ b/app/controllers/sync_forge_controller.rb @@ -5,7 +5,7 @@ class SyncForgeController < ApplicationController sync_counts = params[:sync_count] || 10 projects = Project.includes(:project_score, :repository) .where(is_public: true) - .where.not(identifier: ["educoder","trustieforge", "gitlab"]) + .where.not(identifier: ["educoder","trustieforge", "gitlab", "rGDBbQmOK", "socialforge"]) .joins(:project_score).order("project_scores.changeset_num desc").limit(sync_counts.to_i) projects.each do | project | SyncProjectMilitaryJob.perform_later(project, project.repository, project.project_score) diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb index 4e62340e4..8c52181e6 100644 --- a/app/jobs/sync_project_military_job.rb +++ b/app/jobs/sync_project_military_job.rb @@ -5,8 +5,8 @@ class SyncProjectMilitaryJob < ApplicationJob queue_as :default def perform(project, repository, project_socre) - SyncLog.sync_log("============begin to sync project ===========") - project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count) + SyncLog.sync_log("============begin to sync project, project_id: #{project.id} ===========") + project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count forked_from_project_id forked_count) project_params = { project: project.as_json(except: project_except_params), repository: repository.as_json(except: %w(id project_id login user_id)), From 5aff092a35fcfd1a6be5f6815988733e9075a246 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 12:35:56 +0800 Subject: [PATCH 08/16] Change --- app/controllers/pull_requests_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index bd4e0d8f8..37493d943 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -70,7 +70,11 @@ class PullRequestsController < ApplicationController if local_requests.save remote_pr_params = @local_params remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + if @project.forked_from_project_id.present? + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + else + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + end 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 0aa46815f28878912473c6db3fc91f49db4cdd8b Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 13:27:13 +0800 Subject: [PATCH 09/16] Change Project Id --- app/controllers/pull_requests_controller.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 916f02ece..fdf52104b 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -29,7 +29,7 @@ class PullRequestsController < ApplicationController @projects_names = [{ project_user_login: @user.try(:login), project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}", - project_id: @project.id + project_id: @project.identifier }] @merge_projects = @projects_names fork_project = @project.fork_project if @is_fork @@ -37,7 +37,7 @@ class PullRequestsController < ApplicationController @merge_projects.push({ project_user_login: fork_project.owner.try(:login), project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}", - project_id: fork_project.id + project_id: fork_project.identifier }) end end @@ -70,11 +70,7 @@ class PullRequestsController < ApplicationController if local_requests.save remote_pr_params = @local_params remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] - if @project.forked_from_project_id.present? - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) - else - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) - end + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) 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 5f3f6748f24cf03d4c6d84afbca5d549a642bad5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 13:34:32 +0800 Subject: [PATCH 10/16] Change --- app/views/pull_requests/new.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/pull_requests/new.json.jbuilder b/app/views/pull_requests/new.json.jbuilder index ab0e87135..7d406f684 100644 --- a/app/views/pull_requests/new.json.jbuilder +++ b/app/views/pull_requests/new.json.jbuilder @@ -1,5 +1,5 @@ json.partial! "commons/success" -json.project_id @project.id +json.project_id @project.identifier json.branches @all_branches json.is_fork @is_fork json.projects_names @projects_names From e092c1f222397515582e6457c989435fde0373f2 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 13:49:36 +0800 Subject: [PATCH 11/16] Change --- app/controllers/pull_requests_controller.rb | 6 ++++-- app/views/pull_requests/new.json.jbuilder | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index fdf52104b..714353792 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -29,7 +29,8 @@ class PullRequestsController < ApplicationController @projects_names = [{ project_user_login: @user.try(:login), project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}", - project_id: @project.identifier + project_id: @project.identifier, + id: @project.id }] @merge_projects = @projects_names fork_project = @project.fork_project if @is_fork @@ -37,7 +38,8 @@ class PullRequestsController < ApplicationController @merge_projects.push({ project_user_login: fork_project.owner.try(:login), project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}", - project_id: fork_project.identifier + project_id: fork_project.identifier, + id: fork_project.id }) end end diff --git a/app/views/pull_requests/new.json.jbuilder b/app/views/pull_requests/new.json.jbuilder index 7d406f684..8110e2972 100644 --- a/app/views/pull_requests/new.json.jbuilder +++ b/app/views/pull_requests/new.json.jbuilder @@ -1,5 +1,6 @@ json.partial! "commons/success" json.project_id @project.identifier +json.id @project.id json.branches @all_branches json.is_fork @is_fork json.projects_names @projects_names From b1d974c3621d6c4d0f089768b88270a8df3a94e0 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:35:31 +0800 Subject: [PATCH 12/16] Change --- app/controllers/pull_requests_controller.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 714353792..da09c46b0 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -71,8 +71,17 @@ class PullRequestsController < ApplicationController local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save remote_pr_params = @local_params - remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + if local_requests.is_original && params[:merge_user_login] + remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact + + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @project.fork_project.try(:identifier), remote_pr_params.except(:milestone)) + else + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + + end + #remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] + + #gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) 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 531b66e862a360aaf44043921bc06644db525cb5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:48:12 +0800 Subject: [PATCH 13/16] Change --- app/controllers/pull_requests_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index da09c46b0..918a65084 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -61,11 +61,14 @@ class PullRequestsController < ApplicationController merge_params pull_issue = Issue.new(@issue_params) if pull_issue.save! + if params[:fork_project_id].present? + _fork_project = @project.fork_project + end pr_params = { user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: params[:fork_project_id], + fork_project_id: _fork_project.id, is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) @@ -74,7 +77,7 @@ class PullRequestsController < ApplicationController if local_requests.is_original && params[:merge_user_login] remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @project.fork_project.try(:identifier), remote_pr_params.except(:milestone)) + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) else gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) From fae9df56a48d68299155194059cb7819c5932fbe Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:49:52 +0800 Subject: [PATCH 14/16] cahnge --- app/controllers/pull_requests_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 918a65084..52c175f55 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -68,7 +68,7 @@ class PullRequestsController < ApplicationController user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: _fork_project.id, + fork_project_id: _fork_project&.id, is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) @@ -77,7 +77,7 @@ class PullRequestsController < ApplicationController if local_requests.is_original && params[:merge_user_login] remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project&.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) else gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) From 1bfcc466fe28bb7c36e32a3a6414e0c355b56eb6 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 15:04:09 +0800 Subject: [PATCH 15/16] change --- app/controllers/pull_requests_controller.rb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 52c175f55..714353792 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -61,30 +61,18 @@ class PullRequestsController < ApplicationController merge_params pull_issue = Issue.new(@issue_params) if pull_issue.save! - if params[:fork_project_id].present? - _fork_project = @project.fork_project - end pr_params = { user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: _fork_project&.id, + fork_project_id: params[:fork_project_id], is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save remote_pr_params = @local_params - if local_requests.is_original && params[:merge_user_login] - remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project&.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) - else - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) - - end - #remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] - - #gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) 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 7a3f8cf47f94de935995db747defc2275829905d Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Sat, 15 Aug 2020 19:52:58 +0800 Subject: [PATCH 16/16] FIX migrate api bug --- app/views/projects/migrate.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/migrate.json.jbuilder b/app/views/projects/migrate.json.jbuilder index 818eb0180..c9ae044ee 100644 --- a/app/views/projects/migrate.json.jbuilder +++ b/app/views/projects/migrate.json.jbuilder @@ -1 +1 @@ -json.extract! @project, :id, :name +json.extract! @project, :id, :name, :identifier