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

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"