diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-04 19:36:22 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-04 19:36:22 +0400 |
commit | bcc4e4dc7ed0740e92a61fc82c3c669f8f2d8d30 (patch) | |
tree | 1df3e2d68cd524af4dce107b2e4227778bb3945d /db/schema.rb | |
parent | 211e435ade337c968fab11c52427c172adcec99a (diff) | |
parent | e0af7cefb4c92b474d14116b40927d70c13e78cc (diff) |
Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
Gemfile.lock
app/models/ability.rb
app/models/project.rb
app/views/snippets/_form.html.haml
db/schema.rb
features/steps/shared/paths.rb
spec/factories.rb
spec/models/project_spec.rb
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 6a16caf59d8..21e553dd612 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -203,12 +203,14 @@ ActiveRecord::Schema.define(:version => 20130522141856) do create_table "snippets", :force => true do |t| t.string "title" t.text "content" - t.integer "author_id", :null => false - t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.integer "author_id", :null => false + t.integer "project_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "file_name" t.datetime "expires_at" + t.boolean "private", :default => true, :null => false + t.string "type" end add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at" |