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, 15 insertions, 1 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index f9e25382b61..b596f80fa9e 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -197,7 +197,7 @@ FactoryGirl.define do
     url
   end
 
-  factory :snippet do
+  factory :project_snippet do
     project
     author
     title
@@ -205,6 +205,20 @@ FactoryGirl.define do
     file_name
   end
 
+  factory :personal_snippet do
+    author
+    title
+    content
+    file_name
+  end
+
+  factory :snippet do
+    author
+    title
+    content
+    file_name
+  end
+
   factory :protected_branch do
     name
     project