From 6410b68ea45d73d3ec72dc63db9100fef27e8e6a Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 21 Jul 2010 14:31:08 -0700
Subject: [PATCH] added correct path to ignore for uploads

---
 .gitignore                      | 1 -
 app/uploaders/image_uploader.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c85a7cba55..721b1f8308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,3 @@ gpg/diaspora-development/*.gpg
 gpg/diaspora-production/*.gpg
 gpg/*/random_seed
 public/uploads/*
-public/public/*
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index a1b9201a1f..31fb5e5a27 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -4,7 +4,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "public/uploads"
+    "uploads"
   end
 
   def extension_white_list
-- 
GitLab