Merge branch 'master' of https://github.com/andreassteph/fetsite

Conflicts:
	config/routes.rb

spec/factories/fetprofiles.rb

@@ -0,0 +1,13 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :fetprofile do
+    vorname "MyString"
+    nachname "MyString"
+    short "MyString"
+    fetmailalias "MyString"
+    desc "MyText"
+    picture "MyString"
+    active false
+  end
+end

spec/factories/fetzneditions.rb

@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :fetznedition do
+    title "MyString"
+    desc "MyText"
+    datum "2013-08-19"
+    datei "MyString"
+  end
+end

spec/factories/fotos.rb

@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :foto do
+    title "MyString"
+    desc "MyText"
+    gallery_id 1
+    datei "MyString"
+  end
+end

spec/factories/galleries.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :gallery do
+    name "MyString"
+    desc "MyText"
+    datum "2013-08-19"
+  end
+end

spec/factories/gremien.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :gremium do
+    name "MyString"
+    desc "MyText"
+    typ "MyString"
+  end
+end

spec/factories/memberships.rb

@@ -0,0 +1,11 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :membership do
+    fetprofile_id "MyString"
+    gremium_id "MyString"
+    start "2013-08-19"
+    stop "2013-08-19"
+    typ "MyString"
+  end
+end