Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'fsmanuel/master' into master.

Browse source 
Updated migration date to today.

Conflicts:
	db/schema.rb
This commit is contained in:
wvengen 2013-07-18 18:48:49 +02:00
commit 74bfc85562
21 changed files with 269 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

13
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20130624085246) do
ActiveRecord::Schema.define(:version => 20130718183101) do
create_table "article_categories", :force => true do |t|
t.string "name", :default => "", :null => false
@ -268,6 +268,17 @@ ActiveRecord::Schema.define(:version => 20130624085246) do
t.datetime "updated_at", :null => false
end
create_table "settings", :force => true do |t|
t.string "var", :null => false
t.text "value"
t.integer "thing_id"
t.string "thing_type", :limit => 30
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
add_index "settings", ["thing_type", "thing_id", "var"], :name => "index_settings_on_thing_type_and_thing_id_and_var", :unique => true
create_table "stock_changes", :force => true do |t|
t.integer "delivery_id"
t.integer "order_id"