diff options
author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-27 23:28:37 +0400 |
---|---|---|
committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-27 23:28:37 +0400 |
commit | 89fa800e28e4b740b9de2e526f0f4354d8310ecb (patch) | |
tree | fcf4b1441802016aa962fea4d62d706921aea54c /db | |
parent | f4e7ad7a4b8f188419104995e7b6346149ab31ab (diff) | |
parent | b6cdd1c819b4a43cd00dfdc9dbffc1490593a8b5 (diff) |
Merge branch 'refs/heads/snippets_expiration' into dev
Conflicts:
db/schema.rb
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20111027051828_add_expires_at_to_snippets.rb | 5 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20111027051828_add_expires_at_to_snippets.rb b/db/migrate/20111027051828_add_expires_at_to_snippets.rb new file mode 100644 index 00000000000..0d94b33376b --- /dev/null +++ b/db/migrate/20111027051828_add_expires_at_to_snippets.rb @@ -0,0 +1,5 @@ +class AddExpiresAtToSnippets < ActiveRecord::Migration + def change + add_column :snippets, :expires_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 9c99e5328e5..1ac90a9b400 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -65,6 +65,7 @@ ActiveRecord::Schema.define(:version => 20111027142641) do t.datetime "created_at" t.datetime "updated_at" t.string "file_name" + t.datetime "expires_at" end create_table "users", :force => true do |t| |