git-conflict-blame 0.4.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 648e9062a9e6437008a337c21b29105e904e6929
4
- data.tar.gz: 870c341a8573536504db258ec892bf307ea20e16
3
+ metadata.gz: 38b05ff3f0948a3e288ef36f86897d80711d3ed8
4
+ data.tar.gz: 12ebb567c760306b7176b4e599292c9f0c4ec0ee
5
5
  SHA512:
6
- metadata.gz: 1fd508711a2cd336a46dc97990a0fbf71e630ecd1d93716bea0178a2d0ef3cde07d3dddcedea4eb37cd25435a840939776c225464888ced68040b6001ab28b5d
7
- data.tar.gz: de7c8e123ffb1bce5b2b51a55921366d5f9c9da44c0c9c9d633ff1aabff709406f7ddda3c0987b3125489a81955e3e4402b18994c4d39187a083f0ce7e1b1060
6
+ metadata.gz: 73f1e459b2ea150dbabe7afe0ac160c7a4820f764320543be8d9924d65557187cd9c25bef8d1936f320e6cf9160dab33c659fba8411a3a77b3d16260a691ae4c
7
+ data.tar.gz: f0181bd2df8dc260287fa3cbce25203822bf6bd2f354a07329b99f5498cf2ab7fa739e2e70c6f28d390ff1fdb3c91d8ddf4d4885f2a791870deb5bfa085fb2ec
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
22
22
 
23
23
  spec.add_development_dependency 'bundler', '~> 1.10'
24
24
  spec.add_development_dependency 'rake', '~> 10.0'
25
- spec.add_development_dependency 'rspec', '~> 3.3'
25
+ spec.add_development_dependency 'rspec', '~> 3.5'
26
26
 
27
- spec.add_dependency 'rugged', '~> 0.23'
28
- spec.add_dependency 'colorize', '~> 0.7'
27
+ spec.add_dependency 'rugged', '~> 0.24'
28
+ spec.add_dependency 'colorize', '~> 0.8'
29
29
  spec.add_dependency 'nesty', '~> 1.0'
30
30
  end
@@ -1,3 +1,3 @@
1
1
  class GitConflictBlame
2
- VERSION = '0.4.1'
2
+ VERSION = '0.5.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-conflict-blame
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Terry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-15 00:00:00.000000000 Z
11
+ date: 2016-08-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -44,42 +44,42 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '3.3'
47
+ version: '3.5'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '3.3'
54
+ version: '3.5'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rugged
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0.23'
61
+ version: '0.24'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '0.23'
68
+ version: '0.24'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: colorize
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '0.7'
75
+ version: '0.8'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '0.7'
82
+ version: '0.8'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: nesty
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
133
133
  version: '0'
134
134
  requirements: []
135
135
  rubyforge_project:
136
- rubygems_version: 2.5.1
136
+ rubygems_version: 2.6.6
137
137
  signing_key:
138
138
  specification_version: 4
139
139
  summary: Git Conflict Blame