gitlab-elasticsearch-git 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0282fc661a63a7df2bacfd3e4da215d2c689d0
-  data.tar.gz: 0b3267f71ed82e71bdc3f25b58a594dd2f91aa6a
+  metadata.gz: d953d42fd3e6260fa511dc44299272019a928dd4
+  data.tar.gz: 18fd0b44716271d7bfe730accd3b3ff57b89827e
 SHA512:
-  metadata.gz: 9f0fe56d9a2bff37ffccc9f92de92f5494123fa2873f40f34876daca40340fc47f4f9143899bd6c28517da0c278476cd73215509237a3b2ccaebf87075819280
-  data.tar.gz: 6738e1e8628d01b6c1bee9e24632ef4f2914204d1287a9978b62595d12522d10933b4e7e9d00942e1ba3ac9fc6d01fe28e937756f2969683fd0e929dbd89115b
+  metadata.gz: 26f1cf32a9dbdd177712d2aad5ce867027986be3a2f5a121036f9df06e4cad609ed590bd6a452e347cc97210db7f003e85dccb37924220c569359de66cb3e0b6
+  data.tar.gz: fa4fefcd1da0dfee0fe6a9e9993c10d51c0c4223ca187c47036e3eb6bf7c8af5a65291eabc01d760ae5649dd408895cea46b307a2b049d45e8749e8a269c5146

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.0.11
+ - Fix an ArgumentError when calling `merge_base`
+
 0.0.10
  - Fix gem so it will work without rails
  - Rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-elasticsearch-git (0.0.9)
+    gitlab-elasticsearch-git (0.0.11)
       activemodel (~> 4.2)
       activesupport (~> 4.2)
       charlock_holmes (~> 0.7)

data/lib/elasticsearch/git/repository.rb

@@ -205,7 +205,10 @@ module Elasticsearch
                    if to_rev == repository_for_indexing.last_commit.oid
                      nil
                    else
-                     merge_base(to_rev)
+                     repository_for_indexing.merge_base(
+                       to_rev,
+                       repository_for_indexing.last_commit.oid
+                     )
                    end
                  else
                    from_rev
@@ -337,7 +340,7 @@ module Elasticsearch
           return @rugged_repo_indexer if defined? @rugged_repo_indexer
 
           @path_to_repo ||= repo_path || path_to_repo
-          
+
           set_repository_id
 
           @rugged_repo_indexer = Rugged::Repository.new(@path_to_repo)
@@ -362,13 +365,6 @@ module Elasticsearch
 
           results
         end
-
-        private
-
-        def merge_base(to_rev)
-          head_sha = repository_for_indexing.last_commit.oid
-          repository_for_indexing.merge_base(to_rev, head_sha)
-        end
       end
 
       module ClassMethods

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Elasticsearch integrations for git repositories.