jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

冲突编辑

This commit is contained in:
z9hang 2014-07-11 11:53:31 +08:00
parent fcdfeae326
commit e1c7aaa220
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/schema.rb
View File

@ -12,7 +12,6 @@
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20140711012924) do
>>>>>>> 056f86caad29ca95632d9da9e1e616cd00e2349a
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@ -805,7 +804,7 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
end
create_table "relative_memos", :force => true do |t|
t.integer "osp_id", :null => false
t.integer "osp_id"
t.integer "parent_id"
t.string "subject", :null => false
t.text "content", :null => false
@ -842,19 +841,6 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
create_table "rich_rich_files", :force => true do |t|
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "rich_file_file_name"
t.string "rich_file_content_type"
t.integer "rich_file_file_size"
t.datetime "rich_file_updated_at"
t.string "owner_type"
t.integer "owner_id"
t.text "uri_cache"
t.string "simplified_type", :default => "file"
end
create_table "roles", :force => true do |t|
t.string "name", :limit => 30, :default => "", :null => false
t.integer "position", :default => 1