From b97c42d0ae576e44b58415eaf21fd3bbc30e2997 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 2 Mar 2022 10:33:35 +0800 Subject: [PATCH 1/3] fix: email logo --- public/images/email_logo.svg | 15 +++++++++++++++ public/message_template/issue_assigned.html | 2 +- public/message_template/issue_changed.html | 2 +- public/message_template/issue_deleted.html | 2 +- public/message_template/issue_expire.html | 2 +- public/message_template/organization_joined.html | 2 +- public/message_template/organization_left.html | 2 +- public/message_template/organization_role.html | 2 +- public/message_template/project_issue.html | 2 +- public/message_template/project_joined.html | 2 +- public/message_template/project_left.html | 2 +- .../message_template/project_member_joined.html | 2 +- public/message_template/project_member_left.html | 2 +- public/message_template/project_milestone.html | 2 +- .../project_milestone_completed.html | 2 +- public/message_template/project_pull_request.html | 2 +- public/message_template/project_role.html | 2 +- .../message_template/project_setting_changed.html | 2 +- .../message_template/pull_request_assigned.html | 2 +- public/message_template/pull_request_changed.html | 2 +- public/message_template/pull_request_closed.html | 2 +- public/message_template/pull_request_merged.html | 2 +- public/message_template/team_joined.html | 2 +- public/message_template/team_left.html | 2 +- 24 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 public/images/email_logo.svg diff --git a/public/images/email_logo.svg b/public/images/email_logo.svg new file mode 100644 index 000000000..35501c2ba --- /dev/null +++ b/public/images/email_logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/public/message_template/issue_assigned.html b/public/message_template/issue_assigned.html index c45bb6eec..641200ead 100755 --- a/public/message_template/issue_assigned.html +++ b/public/message_template/issue_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_changed.html b/public/message_template/issue_changed.html index db696a0cc..ab70668b6 100755 --- a/public/message_template/issue_changed.html +++ b/public/message_template/issue_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_deleted.html b/public/message_template/issue_deleted.html index 335fdfbc0..4da71b587 100755 --- a/public/message_template/issue_deleted.html +++ b/public/message_template/issue_deleted.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/issue_expire.html b/public/message_template/issue_expire.html index 34701a0a3..babc8c090 100644 --- a/public/message_template/issue_expire.html +++ b/public/message_template/issue_expire.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_joined.html b/public/message_template/organization_joined.html index 7d50ebdb3..bd021d5f1 100755 --- a/public/message_template/organization_joined.html +++ b/public/message_template/organization_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_left.html b/public/message_template/organization_left.html index b2eeffbbe..858530648 100755 --- a/public/message_template/organization_left.html +++ b/public/message_template/organization_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/organization_role.html b/public/message_template/organization_role.html index ad597dea6..229b6da1c 100755 --- a/public/message_template/organization_role.html +++ b/public/message_template/organization_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_issue.html b/public/message_template/project_issue.html index 4b6812fce..05fd59b2e 100755 --- a/public/message_template/project_issue.html +++ b/public/message_template/project_issue.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_joined.html b/public/message_template/project_joined.html index fa8f0771b..1a47994af 100755 --- a/public/message_template/project_joined.html +++ b/public/message_template/project_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_left.html b/public/message_template/project_left.html index 81453d22d..beadefe4c 100755 --- a/public/message_template/project_left.html +++ b/public/message_template/project_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_joined.html b/public/message_template/project_member_joined.html index b22ced2d7..7ae5b37f8 100755 --- a/public/message_template/project_member_joined.html +++ b/public/message_template/project_member_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_member_left.html b/public/message_template/project_member_left.html index d1a8b044f..2f1b75508 100755 --- a/public/message_template/project_member_left.html +++ b/public/message_template/project_member_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_milestone.html b/public/message_template/project_milestone.html index 0b2a0725c..19111666b 100644 --- a/public/message_template/project_milestone.html +++ b/public/message_template/project_milestone.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_milestone_completed.html b/public/message_template/project_milestone_completed.html index 6b62a8cb9..3ba86dc05 100644 --- a/public/message_template/project_milestone_completed.html +++ b/public/message_template/project_milestone_completed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_pull_request.html b/public/message_template/project_pull_request.html index fe389e98c..c4afdf150 100755 --- a/public/message_template/project_pull_request.html +++ b/public/message_template/project_pull_request.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_role.html b/public/message_template/project_role.html index 3e8e8b55c..49db5997b 100755 --- a/public/message_template/project_role.html +++ b/public/message_template/project_role.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/project_setting_changed.html b/public/message_template/project_setting_changed.html index ecea17ef8..d3c5db32e 100755 --- a/public/message_template/project_setting_changed.html +++ b/public/message_template/project_setting_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_assigned.html b/public/message_template/pull_request_assigned.html index 1d1810613..8c98ea303 100755 --- a/public/message_template/pull_request_assigned.html +++ b/public/message_template/pull_request_assigned.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_changed.html b/public/message_template/pull_request_changed.html index ccbefad92..0278b60ed 100755 --- a/public/message_template/pull_request_changed.html +++ b/public/message_template/pull_request_changed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_closed.html b/public/message_template/pull_request_closed.html index c860a54a1..5bc26eb1c 100755 --- a/public/message_template/pull_request_closed.html +++ b/public/message_template/pull_request_closed.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/pull_request_merged.html b/public/message_template/pull_request_merged.html index 59812ddd3..b60db94a8 100755 --- a/public/message_template/pull_request_merged.html +++ b/public/message_template/pull_request_merged.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/team_joined.html b/public/message_template/team_joined.html index 36610f728..959d2d47f 100755 --- a/public/message_template/team_joined.html +++ b/public/message_template/team_joined.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

diff --git a/public/message_template/team_left.html b/public/message_template/team_left.html index ea2cce649..f064c153a 100755 --- a/public/message_template/team_left.html +++ b/public/message_template/team_left.html @@ -24,7 +24,7 @@
- +

确实开源，协同创新

From 3091593d143cf11960b0c24482260e6140699e69 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 2 Mar 2022 10:48:21 +0800 Subject: [PATCH 2/3] add: standalone admin menu --- config/routes.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 05ffc8b5f..3c442fdde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -672,6 +672,15 @@ Rails.application.routes.draw do namespace :admins do mount Sidekiq::Web => '/sidekiq' get '/', to: 'dashboards#index' + namespace :topic do + resources :activity_forums + resources :banners + resources :cards + resources :cooperators + resources :excellent_projects + resources :experience_forums + resources :pinned_forums + end resources :project_statistics, only: [:index] do collection do get :visits_static From 94d259ea03b54cb94b558f7bfb6e2975c17eddf5 Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Thu, 3 Mar 2022 14:16:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fixed=20fork=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=BB=84=E7=BB=87=E6=97=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/fork_users.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/fork_users.json.jbuilder b/app/views/projects/fork_users.json.jbuilder index a539797e7..f5147e19e 100644 --- a/app/views/projects/fork_users.json.jbuilder +++ b/app/views/projects/fork_users.json.jbuilder @@ -1,7 +1,7 @@ json.count @forks_count json.users do json.array! @fork_users.each do |f| - user = f.user + user = f.user.present? ? f.user : Organization.find_by(id: f.user_id) json.id f.fork_project.id json.identifier f.fork_project.identifier json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"