zhangxunhui
4 years ago
2 changed files with 2 additions and 7 deletions
Unified View
Diff Options
+ 1
- 2
app/models/topic/glcc_news.rb
View File
| @@ -6,7 +6,6 @@ | |||||
| # type :string(255) | # type :string(255) | ||||
| # title :string(255) | # title :string(255) | ||||
| # uuid :integer | # uuid :integer | ||||
| # image_url :string(255) | |||||
| # url :string(255) | # url :string(255) | ||||
| # order_index :integer | # order_index :integer | ||||
| # | # | ||||
| @@ -14,4 +13,4 @@ | |||||
| # GLCC 新闻稿 | # GLCC 新闻稿 | ||||
| class Topic::GlccNews < Topic | class Topic::GlccNews < Topic | ||||
| end | |||||
| end | |||||
+ 1
- 5
app/services/projects/create_service.rb
View File
| @@ -47,12 +47,8 @@ class Projects::CreateService < ApplicationService | |||||
| ignore_id: params[:ignore_id], | ignore_id: params[:ignore_id], | ||||
| license_id: params[:license_id], | license_id: params[:license_id], | ||||
| website: params[:website], | website: params[:website], | ||||
| <<<<<<< HEAD | |||||
| identifier: params[:repository_name], #新增,hs | |||||
| identifier: params[:repository_name], | |||||
| use_blockchain: repo_use_blockchain # 新增,zxh | use_blockchain: repo_use_blockchain # 新增,zxh | ||||
| ======= | |||||
| identifier: params[:repository_name] | |||||
| >>>>>>> upstream/master | |||||
| } | } | ||||
| end | end | ||||