gitlab-grit 2.6.8 → 2.6.9
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.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/grit/commit.rb +4 -8
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 91628dfa7d6ccd4bdf412c0c38315137910bfc89
|
|
4
|
+
data.tar.gz: 000bd780528b454afe3eca1e92ba94ae82c13513
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 83b5a66fbdaa910c62f8dc31bd3f53ad8735a95b596a5f74d711b501d60cf04c1ac96dd3afbf3474b681af47abf309c4c48a7d38e5aa0d6288d33b1b6a4bb50a
|
|
7
|
+
data.tar.gz: 109ddf8ab210e7e3b00167273324046572bfe31821a1fd86df9918697a86f58ebcb6dfe187b1a9adc005ba091b5bcc7d4701c1850ef76c77af7389ae1ad54f59
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.6.
|
|
1
|
+
2.6.9
|
data/lib/grit/commit.rb
CHANGED
|
@@ -146,7 +146,7 @@ module Grit
|
|
|
146
146
|
# GITLAB patch
|
|
147
147
|
# Skip all garbage unless we get real commit
|
|
148
148
|
while !lines.empty? && lines.first !~ /^commit [a-zA-Z0-9]*$/
|
|
149
|
-
lines.shift
|
|
149
|
+
lines.shift
|
|
150
150
|
end
|
|
151
151
|
|
|
152
152
|
id = lines.shift.split.last
|
|
@@ -214,8 +214,8 @@ module Grit
|
|
|
214
214
|
diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
|
|
215
215
|
end
|
|
216
216
|
|
|
217
|
-
if diff =~ /diff --git
|
|
218
|
-
diff = diff.sub(
|
|
217
|
+
if diff =~ /diff --git a/
|
|
218
|
+
diff = diff.sub(/.*?(diff --git a)/m, '\1')
|
|
219
219
|
else
|
|
220
220
|
diff = ''
|
|
221
221
|
end
|
|
@@ -228,11 +228,7 @@ module Grit
|
|
|
228
228
|
#
|
|
229
229
|
# Returns Grit::Diff[] (baked)
|
|
230
230
|
def diffs(options = {})
|
|
231
|
-
|
|
232
|
-
show
|
|
233
|
-
else
|
|
234
|
-
self.class.diff(@repo, parents.first.id, @id, [], options)
|
|
235
|
-
end
|
|
231
|
+
show
|
|
236
232
|
end
|
|
237
233
|
|
|
238
234
|
def stats
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gitlab-grit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tom Preston-Werner
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2014-06-
|
|
13
|
+
date: 2014-06-14 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: charlock_holmes
|