danger-conflict_checker 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/conflict_checker/gem_version.rb +1 -1
- data/lib/conflict_checker/plugin.rb +1 -0
- metadata +2 -3
- data/hoge +0 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3eeb3296b85a9d1d39f0fa71c82d0585dba87676
|
|
4
|
+
data.tar.gz: 3b2bb294752b5f0840dd90ce08bb42e155ce13b7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d78e058761081885d311f63d2b065ef070db1338cf46b7340bcf13cb3dda930e91d99299e16503ddf3849943532be67030c1dd8e504e4264a0bae87224c5779e
|
|
7
|
+
data.tar.gz: 4c23f93803368916a8f11fad343c555e9769dab9176f9f0fe46ff3d90fa6e7a971d099594b22df8d1062d580cbd238cf0ae8b7ae9d6d1e5aa7b8c9a2b34b2a53
|
data/Gemfile.lock
CHANGED
|
@@ -89,6 +89,7 @@ module Danger
|
|
|
89
89
|
results = check_conflict()
|
|
90
90
|
|
|
91
91
|
results.each do |result|
|
|
92
|
+
next if result[:mergeable]
|
|
92
93
|
message = "<p>This PR conflicts with <a href=\"#{result[:pull_request][:html_url]}\">##{result[:pull_request][:number]}</a>.</p>"
|
|
93
94
|
table = '<table><thead><tr><th width="100%">File</th><th>Line</th></tr></thead><tbody>' + result[:conflicts].map do |conflict|
|
|
94
95
|
file = conflict[:file]
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: danger-conflict_checker
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Masayoshi Sakamoto
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-09-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: danger-plugin-api
|
|
@@ -181,7 +181,6 @@ files:
|
|
|
181
181
|
- Rakefile
|
|
182
182
|
- circle.yml
|
|
183
183
|
- danger-conflict_checker.gemspec
|
|
184
|
-
- hoge
|
|
185
184
|
- lib/conflict_checker/gem_version.rb
|
|
186
185
|
- lib/conflict_checker/plugin.rb
|
|
187
186
|
- lib/danger_conflict_checker.rb
|