From 035a3dedb5a6f9e394a294f7e1fea2166039329e Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 3 Mar 2014 14:48:58 +0100
Subject: [PATCH] Remove backup uploads symlink patch

---
 config/patches/gitlab-rails/backup_uploads_realpath.patch | 24 ------------------------
 config/software/gitlab-rails.rb                           |  5 -----
 2 files changed, 0 insertions(+), 29 deletions(-)
 delete mode 100644 config/patches/gitlab-rails/backup_uploads_realpath.patch

diff --git a/config/patches/gitlab-rails/backup_uploads_realpath.patch b/config/patches/gitlab-rails/backup_uploads_realpath.patch
deleted file mode 100644
index cbaaf5d..0000000
--- a/config/patches/gitlab-rails/backup_uploads_realpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb
-index e79da7e..e50e1ff 100644
---- a/lib/backup/uploads.rb
-+++ b/lib/backup/uploads.rb
-@@ -3,7 +3,7 @@ module Backup
-     attr_reader :app_uploads_dir, :backup_uploads_dir, :backup_dir
- 
-     def initialize
--      @app_uploads_dir = Rails.root.join('public', 'uploads')
-+      @app_uploads_dir = File.realpath(Rails.root.join('public', 'uploads'))
-       @backup_dir = Gitlab.config.backup.path
-       @backup_uploads_dir = File.join(Gitlab.config.backup.path, 'uploads')
-     end
-@@ -21,8 +21,9 @@ module Backup
-     end
- 
-     def backup_existing_uploads_dir
-+      timestamped_uploads_path = File.join(app_uploads_dir, '..', "uploads.#{Time.now.to_i}")
-       if File.exists?(app_uploads_dir)
--        FileUtils.mv(app_uploads_dir, Rails.root.join('public', "uploads.#{Time.now.to_i}"))
-+        FileUtils.mv(app_uploads_dir, timestamped_uploads_path)
-       end
-     end
-   end
diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb
index 02fddd8..792bb36 100644
--- a/config/software/gitlab-rails.rb
+++ b/config/software/gitlab-rails.rb
@@ -44,11 +44,6 @@ build do
   # build.
   command "sed -i \"s/.*REVISION.*/REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb"
 
-  # The user uploads path is not (yet) configurable in gitlab-rails. As a
-  # workaround, omnibus-gitlab creates a symlink for public/uploads. This breaks
-  # the GitLab backup script.
-  patch :source => "backup_uploads_realpath.patch"
-
   bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem", :env => env
 
   # In order to precompile the assets, we need to get to a state where rake can
--
libgit2 0.21.2