Merge branch '6.2.1-rugged-0.21.2' into 'version-6-2'

6.2.1 with rugged 0.21.2

This is intended for use with GitLab 7.2.

See merge request !18

CHANGELOG

+v 6.2.2
+  - Updated rugged to 0.21.2
+
 v 6.2.1
   - Fix Branch.new method for branch "origin/HEAD" because it points on ref instead of commit. 

Gemfile.lock

@@ -6,12 +6,12 @@ PATH
       charlock_holmes (~> 0.6)
       gitlab-grit (~> 2.6)
       gitlab-linguist (~> 3.0)
-      rugged (~> 0.21.0)
+      rugged (~> 0.21.2)
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.4)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -32,7 +32,7 @@ GEM
     escape_utils (0.2.4)
     ffi (1.8.1)
     formatador (0.2.4)
-    gitlab-grit (2.7.0)
+    gitlab-grit (2.7.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -59,7 +59,7 @@ GEM
     lumberjack (1.0.3)
     method_source (0.8.1)
     mime-types (1.25.1)
-    minitest (5.4.0)
+    minitest (5.4.3)
     multi_json (1.7.2)
     posix-spawn (0.3.9)
     pry (0.9.12.1)
@@ -81,7 +81,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rugged (0.21.0)
+    rugged (0.21.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)

VERSION

-6.2.1
+6.2.2

gitlab_git.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.add_dependency("gitlab-linguist", "~> 3.0")
   s.add_dependency("gitlab-grit", "~> 2.6")
   s.add_dependency("activesupport", "~> 4.0")
-  s.add_dependency("rugged", "~> 0.21.0")
+  s.add_dependency("rugged", "~> 0.21.2")
   s.add_dependency("charlock_holmes", "~> 0.6")
 end

spec/support/seed_helper.rb

@@ -8,6 +8,13 @@ module SeedHelper
   def create_seeds
     puts 'Prepare seeds'
     FileUtils.mkdir_p(SUPPORT_PATH)
-    system(*%W(git clone --bare https://github.com/gitlabhq/testme.git), chdir: SUPPORT_PATH)
+    system(*%W(git clone --bare https://gitlab.com/gitlab-org/gitlab-git-test.git #{TEST_REPO_PATH}), chdir: SUPPORT_PATH)
+    File.open(File.join(TEST_REPO_PATH, 'refs/heads/master'), 'w') { |f| f.puts SeedRepo::LastCommit::ID }
+    IO.popen(%W(git tag), chdir: TEST_REPO_PATH).read.each_line do |tag|
+      tag.chomp!
+      unless SeedRepo::Repo::TAGS.include?(tag)
+        system(*%W(git tag -d -- #{tag}), chdir: TEST_REPO_PATH)
+      end
+    end
   end
 end