Merge branch 'develop'

* develop: Do not remove Gitlab.config.gitlab.repository_downloads_path Fix repository mapping with gem update fix jenkins worker
Undev · Sep 5, 2014 · 1ca9cce · 1ca9cce
2 parents 3005282 + f4a5a9c
commit 1ca9cce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,7 +37,7 @@ gem "browser"
 # Search
 gem 'elasticsearch-model',  github: 'elasticsearch/elasticsearch-rails',  ref: '88b6597e47c9f45024b603faeddb0a85b47e1fce'
 gem 'elasticsearch-rails',  github: 'elasticsearch/elasticsearch-rails'
-gem 'elasticsearch-git', github: 'zzet/elasticsearch-git', ref: 'a3fb57b303ad8b8c629b301ca009cd7d486089fb'
+gem 'elasticsearch-git', github: 'zzet/elasticsearch-git', ref: '7065da063f31d2f0a2b7c6d237ed39fb704b4772'
 gem 'jquery-friendly_id-rails'
 
 # Extracting information from a git repository

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,8 +16,8 @@ GIT
 
 GIT
   remote: git://github.com/zzet/elasticsearch-git.git
-  revision: a3fb57b303ad8b8c629b301ca009cd7d486089fb
-  ref: a3fb57b303ad8b8c629b301ca009cd7d486089fb
+  revision: 7065da063f31d2f0a2b7c6d237ed39fb704b4772
+  ref: 7065da063f31d2f0a2b7c6d237ed39fb704b4772
   specs:
     elasticsearch-git (0.0.4)
       activemodel (~> 4.1.0)

diff --git a/app/models/repository.rb b/app/models/repository.rb
@@ -220,7 +220,7 @@ def last_commit_for_path(sha, path)
 
   # Remove archives older than 2 hours
   def clean_old_archives
-    Gitlab::Popen.popen(%W(find #{Gitlab.config.gitlab.repository_downloads_path} -mmin +120 -delete))
+    Gitlab::Popen.popen(%W(find #{Gitlab.config.gitlab.repository_downloads_path}/* -mmin +120 -delete))
   end
 
   def branches_sorted_by(value)