diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 110e58951..f5f86dc62 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -37,11 +37,11 @@ class PullRequestsController < ApplicationController
end
issues = issues.where(author_id: params[:author_id]) if params[:author_id].present?
- issues = issues.where(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present?
+ issues = issues.where(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? && params[:assigned_to_id].to_s != "all"
issues = issues.where(tracker_id: params[:tracker_id]) if params[:tracker_id].present?
issues = issues.where(status_id: params[:status_id]) if params[:status_id].present?
issues = issues.where(priority_id: params[:priority_id]) if params[:priority_id].present?
- issues = issues.where(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present?
+ issues = issues.where(fixed_version_id: params[:issue_version]) if params[:issue_version].present? && params[:assigned_to_id].to_s != "all"
issues = issues.where(done_ratio: params[:done_ratio].to_i) if params[:done_ratio].present?
issues = issues.where(issue_type: params[:issue_type]) if params[:issue_type].present?
issues = issues.joins(:issue_tags).where(issue_tags: {id: params[:issue_tag_id].to_i}) if params[:issue_tag_id].present?
diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb
index 00603a58d..0a763fdf8 100644
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@@ -135,6 +135,9 @@ class Gitea::ClientService < ApplicationService
puts "[gitea] "
raise Error, "[gitea] delete ok"
+ when 409
+ message = "创建失败,请检查该分支合并是否已存在"
+ raise Error, mark + message
else
if response&.body.blank?
message = "请求失败"
diff --git a/public/react/build/asset-manifest.json b/public/react/build/asset-manifest.json
index 576b54957..478d5d115 100644
--- a/public/react/build/asset-manifest.json
+++ b/public/react/build/asset-manifest.json
@@ -68,7 +68,7 @@
"./static/js/158.b8182b3b.chunk.js": "./static/js/158.b8182b3b.chunk.js",
"./static/js/159.853da2bd.chunk.js": "./static/js/159.853da2bd.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
- "./static/js/160.2c9c9014.chunk.js": "./static/js/160.2c9c9014.chunk.js",
+ "./static/js/160.8ebeacf3.chunk.js": "./static/js/160.8ebeacf3.chunk.js",
"./static/js/161.1289bb4c.chunk.js": "./static/js/161.1289bb4c.chunk.js",
"./static/js/162.15c1b2d7.chunk.js": "./static/js/162.15c1b2d7.chunk.js",
"./static/js/163.c711c38f.chunk.js": "./static/js/163.c711c38f.chunk.js",
@@ -263,7 +263,7 @@
"./static/js/89.b46c0b37.chunk.js": "./static/js/89.b46c0b37.chunk.js",
"./static/js/9.6f9ef4ac.chunk.js": "./static/js/9.6f9ef4ac.chunk.js",
"./static/js/90.ebdbda62.chunk.js": "./static/js/90.ebdbda62.chunk.js",
- "./static/js/91.f276e8e2.chunk.js": "./static/js/91.f276e8e2.chunk.js",
+ "./static/js/91.02ced85a.chunk.js": "./static/js/91.02ced85a.chunk.js",
"./static/js/92.9e9e70b1.chunk.js": "./static/js/92.9e9e70b1.chunk.js",
"./static/js/93.8a6c50b0.chunk.js": "./static/js/93.8a6c50b0.chunk.js",
"./static/js/94.fa90d379.chunk.js": "./static/js/94.fa90d379.chunk.js",
@@ -273,7 +273,7 @@
"./static/js/98.88d3b919.chunk.js": "./static/js/98.88d3b919.chunk.js",
"./static/js/99.bb3d2c54.chunk.js": "./static/js/99.bb3d2c54.chunk.js",
"main.css": "./static/css/main.c0718fb6.css",
- "main.js": "./static/js/main.a59b16ab.js",
+ "main.js": "./static/js/main.7e92bd1b.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
"static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
diff --git a/public/react/build/index.html b/public/react/build/index.html
index 11696a530..72aa1111c 100644
--- a/public/react/build/index.html
+++ b/public/react/build/index.html
@@ -24,7 +24,7 @@
_host = 'https://ali-cdn.educoder.net/react/build/'
}
document.write('