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