hubmerge 0.0.13 → 0.0.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/hubmerge.rb +6 -6
- data/lib/hubmerge/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 567a734d3f151ef49e07c2cff003c70d2583ffd620a8f341ba0c525c682f8b7f
|
|
4
|
+
data.tar.gz: 5c1c8160b067284ade1a6071e146049fa8be0c4595ddbc6e9462d2732728582f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4b2211384a83dd0f0b66b9281dd07c6c0c0f1788dbf33870797eed110d86fb7d1ae891819a0febb0a620631e1a4e7dc4e5f2c218dc36930dd2e4b1d6c8ab6748
|
|
7
|
+
data.tar.gz: a9d57bc95c04d2898867bd3c998596d1e40807bff0a6f586f0bce90c63a38b5edeaf4d41ac5b08f542bd53c6aebe6215c48340a9cfe985183e88d1cf9654c9b4
|
data/lib/hubmerge.rb
CHANGED
|
@@ -57,6 +57,12 @@ module HubMerge
|
|
|
57
57
|
prs_to_merge.each_with_index do |pr, index|
|
|
58
58
|
mergeable = false
|
|
59
59
|
@spinner.with_parent("[:spinner] PR #{repo_from_pr(pr)}##{pr.number} (#{index + 1}/#{total})") do
|
|
60
|
+
if opts[:approve_before_merge]
|
|
61
|
+
@spinner.with_child("[:spinner] Approving") do
|
|
62
|
+
@merger.approve_if_not_approved(github_client, pr)
|
|
63
|
+
end
|
|
64
|
+
end
|
|
65
|
+
|
|
60
66
|
mergeable = @spinner.with_child("[:spinner] Checking mergeability") {
|
|
61
67
|
begin
|
|
62
68
|
@merger.check_mergeability(github_client, pr)
|
|
@@ -69,12 +75,6 @@ module HubMerge
|
|
|
69
75
|
|
|
70
76
|
next unless mergeable
|
|
71
77
|
|
|
72
|
-
if opts[:approve_before_merge]
|
|
73
|
-
@spinner.with_child("[:spinner] Approving") do
|
|
74
|
-
@merger.approve_if_not_approved(github_client, pr)
|
|
75
|
-
end
|
|
76
|
-
end
|
|
77
|
-
|
|
78
78
|
@spinner.with_child("[:spinner] Merging") do
|
|
79
79
|
@merger.merge(github_client, pr)
|
|
80
80
|
end
|
data/lib/hubmerge/version.rb
CHANGED