yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

This commit is contained in:
zhangxunhui 2022-05-12 09:32:25 +08:00
parent 6b83719632
commit 600d6ab174
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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

6
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],
identifier: params[:repository_name], #新增,hs
use_blockchain: repo_use_blockchain # 新增,zxh use_blockchain: repo_use_blockchain # 新增,zxh
=======
identifier: params[:repository_name]
>>>>>>> upstream/master
} }
end end