gitlab-elasticsearch-git 0.0.10 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +3 -0
  3. data/Gemfile.lock +1 -1
  4. data/lib/elasticsearch/git/repository.rb +5 -9
  5. data/lib/elasticsearch/git/version.rb +1 -1
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0c0282fc661a63a7df2bacfd3e4da215d2c689d0
4
- data.tar.gz: 0b3267f71ed82e71bdc3f25b58a594dd2f91aa6a
3
+ metadata.gz: d953d42fd3e6260fa511dc44299272019a928dd4
4
+ data.tar.gz: 18fd0b44716271d7bfe730accd3b3ff57b89827e
5
5
  SHA512:
6
- metadata.gz: 9f0fe56d9a2bff37ffccc9f92de92f5494123fa2873f40f34876daca40340fc47f4f9143899bd6c28517da0c278476cd73215509237a3b2ccaebf87075819280
7
- data.tar.gz: 6738e1e8628d01b6c1bee9e24632ef4f2914204d1287a9978b62595d12522d10933b4e7e9d00942e1ba3ac9fc6d01fe28e937756f2969683fd0e929dbd89115b
6
+ metadata.gz: 26f1cf32a9dbdd177712d2aad5ce867027986be3a2f5a121036f9df06e4cad609ed590bd6a452e347cc97210db7f003e85dccb37924220c569359de66cb3e0b6
7
+ data.tar.gz: fa4fefcd1da0dfee0fe6a9e9993c10d51c0c4223ca187c47036e3eb6bf7c8af5a65291eabc01d760ae5649dd408895cea46b307a2b049d45e8749e8a269c5146
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ 0.0.11
2
+ - Fix an ArgumentError when calling `merge_base`
3
+
1
4
  0.0.10
2
5
  - Fix gem so it will work without rails
3
6
  - Rspec
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitlab-elasticsearch-git (0.0.9)
4
+ gitlab-elasticsearch-git (0.0.11)
5
5
  activemodel (~> 4.2)
6
6
  activesupport (~> 4.2)
7
7
  charlock_holmes (~> 0.7)
data/lib/elasticsearch/git/repository.rb CHANGED
@@ -205,7 +205,10 @@ module Elasticsearch
205
205
  if to_rev == repository_for_indexing.last_commit.oid
206
206
  nil
207
207
  else
208
- merge_base(to_rev)
208
+ repository_for_indexing.merge_base(
209
+ to_rev,
210
+ repository_for_indexing.last_commit.oid
211
+ )
209
212
  end
210
213
  else
211
214
  from_rev
@@ -337,7 +340,7 @@ module Elasticsearch
337
340
  return @rugged_repo_indexer if defined? @rugged_repo_indexer
338
341
 
339
342
  @path_to_repo ||= repo_path || path_to_repo
340
-
343
+
341
344
  set_repository_id
342
345
 
343
346
  @rugged_repo_indexer = Rugged::Repository.new(@path_to_repo)
@@ -362,13 +365,6 @@ module Elasticsearch
362
365
 
363
366
  results
364
367
  end
365
-
366
- private
367
-
368
- def merge_base(to_rev)
369
- head_sha = repository_for_indexing.last_commit.oid
370
- repository_for_indexing.merge_base(to_rev, head_sha)
371
- end
372
368
  end
373
369
 
374
370
  module ClassMethods
data/lib/elasticsearch/git/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Elasticsearch
2
2
  module Git
3
- VERSION = "0.0.10"
3
+ VERSION = "0.0.11"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-elasticsearch-git
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.10
4
+ version: 0.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-02-08 00:00:00.000000000 Z
13
+ date: 2016-03-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: elasticsearch-model
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
158
158
  version: '0'
159
159
  requirements: []
160
160
  rubyforge_project:
161
- rubygems_version: 2.4.8
161
+ rubygems_version: 2.2.5
162
162
  signing_key:
163
163
  specification_version: 4
164
164
  summary: Elasticsearch integrations for git repositories.