From a4f2243a7aaf9960c57a4cfabe9d8f9380a0c70f Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 19:58:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Apr=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 7 ++++--- app/views/pull_requests/index.json.jbuilder | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 442da5fab..446e3b107 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ #source 'https://gems.ruby-china.com' -source 'https://mirrors.cloud.tencent.com/rubygems/' +# source 'https://mirrors.cloud.tencent.com/rubygems/' +source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'rails', '~> 5.2.0' @@ -26,7 +27,7 @@ gem 'roo-xls' gem 'simple_xlsx_reader', '~>1.0.4' gem 'rubyzip' -gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' +# gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' gem 'spreadsheet' gem 'ruby-ole' # 导出为xlsx @@ -101,7 +102,7 @@ gem 'rails-i18n', '~> 5.1' # job gem 'sidekiq',"5.2.8" -gem 'sinatra' +# gem 'sinatra' gem "sidekiq-cron", "1.2.0" gem 'sidekiq-failures' diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 9f371cb21..6b4175013 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -33,6 +33,7 @@ json.issues do json.name issue.subject json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on) json.pr_full_time pr.status == 1 ? pr.updated_at : issue.updated_on + json.pr_created_unix pr.created_at.to_i json.assign_user_name issue.get_assign_user.try(:show_real_name) json.assign_user_login issue.get_assign_user.try(:login) json.author_name issue.user.blank?? "已注销": issue.user.show_real_name From be4726c6a661bf57f7928efd8f52b750920457f3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 20:01:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Gemfile=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 446e3b107..374dc7fc0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ #source 'https://gems.ruby-china.com' -# source 'https://mirrors.cloud.tencent.com/rubygems/' -source 'https://rubygems.org' +source 'https://mirrors.cloud.tencent.com/rubygems/' +#source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'rails', '~> 5.2.0' @@ -102,7 +102,7 @@ gem 'rails-i18n', '~> 5.1' # job gem 'sidekiq',"5.2.8" -# gem 'sinatra' +gem 'sinatra' gem "sidekiq-cron", "1.2.0" gem 'sidekiq-failures' From 2f6dda4a1511cd511b577c29632c695d8261c0d6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Sun, 27 Oct 2024 20:07:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Gemfile=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 374dc7fc0..a60a04811 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ gem 'roo-xls' gem 'simple_xlsx_reader', '~>1.0.4' gem 'rubyzip' -# gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' +gem 'sonarqube', :git => 'https://gitlink.org.cn/KingChan/sonarqube.git' gem 'spreadsheet' gem 'ruby-ole' # 导出为xlsx