floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 04:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into dev_local_v1

Browse Source 
# Conflicts:
#	app/controllers/projects_controller.rb
#	app/jobs/migrate_remote_repository_job.rb
#	public/assets/.sprockets-manifest-dd73942813e820b803d35c9915c0bb25.json
#	public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js
#	public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js.gz
#	public/assets/admin-a7edfa013f5e822c43ac1a1f813c1929ff7aa9e12cd1313f9e1b7292fa406470.css.gz
This commit is contained in:
xxq250
2023-10-11 15:57:09 +08:00
parent 8909ad2ba8 5a28204b12
commit 111b91584d
298 changed files with 4274 additions and 140056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/api/v1/issues/list_service.rb
View File

@@ -76,7 +76,7 @@ class Api::V1::Issues::ListService < ApplicationService
end
# keyword
issues = issues.ransack(id_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
@total_issues_count = issues.distinct.size
@closed_issues_count = issues.closed.distinct.size

6
app/services/api/v1/projects/contributors/stat_service.rb
View File

@@ -6,7 +6,7 @@ class Api::V1::Projects::Contributors::StatService < ApplicationService
def initialize(project, params, token=nil)
@project = project
@branch = params[:branch]
@pass_year = params[:pass_year]
@pass_year = params[:pass_year] || 3
@page = params[:page] || 1
@limit = params[:limit] || 15
@owner = project&.owner.login
@@ -23,10 +23,10 @@ class Api::V1::Projects::Contributors::StatService < ApplicationService
private
def request_params
param = {
access_token: token
access_token: token, page: page, limit: limit
}
param.merge!(branch: branch) if branch.present?
param.merge!(pass_year: pass_year) if pass_year.present?
param.merge!(pass_year: @pass_year)
param
end