tutter-sppuppet 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/tutter/action/sppuppet.rb +4 -1
- data/tutter-sppuppet.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
OGQ3ODRiYTdlZDIxZWE4ODIzMTBhYjYxM2EwMWI0Y2RjNmVhOGU4MA==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
YjgyNjc4NDJlMzM0YjJmMzgyMTA3ODY1NWE0MGNlNWQyZmRiNjY3MA==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
ZjkwNTUyZDUzNWVjYmI2ZWY1MzdmNGM1ZjNhMTYzMGZlYTk0MDEyOTA5MmVi
|
|
10
|
+
YWFjYTk5OTA5ODY2N2E2YzJhM2ViODczNTFhZDQ1YzRlZmQ2NTNiMDcxMDlh
|
|
11
|
+
ZGUzYzEyYTNjNzk2MjNkMWMxYzBjMWM2ZDhjNGUwZWNiYmQ5NWI=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
ZGI2NGNjZGE1MzYzYWMxY2FiMDdmYjE1NjM2ZGE3NDg0N2U0MGY1OGU3M2E0
|
|
14
|
+
M2NkM2Y4ZTcyYjAyYmMzMjZkNTA0NTRiYjJhMDc2NDc3ZjYxNzQ2YzNiZjU5
|
|
15
|
+
MjczODljYTBkNTAyM2RlY2M1NmVmODdkOGNlYmNiZTNhZGJhN2E=
|
|
@@ -102,7 +102,7 @@ class Sppuppet
|
|
|
102
102
|
msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
|
|
103
103
|
reassure = "I will try to merge this for you when the builds turn green\n" +
|
|
104
104
|
"If your build fails or becomes stuck for some reason, just say 'rebuild'\n" +
|
|
105
|
-
'If have an incident and want to skip the tests
|
|
105
|
+
'If you have an incident and want to skip the tests or the peer review, please post the link to the jira ticket.'
|
|
106
106
|
if merge_command
|
|
107
107
|
return post_comment(pull_request_id, msg + reassure)
|
|
108
108
|
else
|
|
@@ -138,6 +138,9 @@ Tests: #{@client.combined_status(@project, pr.head.sha).statuses.map { |s| [s.st
|
|
|
138
138
|
|
|
139
139
|
#{pr.body}
|
|
140
140
|
MERGE_MSG
|
|
141
|
+
if incident_merge_override
|
|
142
|
+
@client.add_labels_to_an_issue @project, pull_request_id, ['incident']
|
|
143
|
+
end
|
|
141
144
|
begin
|
|
142
145
|
merge_commit = @client.merge_pull_request(@project, pull_request_id, merge_msg)
|
|
143
146
|
rescue Octokit::MethodNotAllowed => e
|
data/tutter-sppuppet.gemspec
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
|
2
2
|
Gem::Specification.new do |s|
|
|
3
3
|
s.name = 'tutter-sppuppet'
|
|
4
|
-
s.version = '1.1.
|
|
4
|
+
s.version = '1.1.3'
|
|
5
5
|
s.author = ['Johan Haals', 'Erik Dalén', 'Alexey Lapitsky']
|
|
6
6
|
s.email = ['johan.haals@gmail.com', 'dalen@spotify.com', 'alexey@spotify.com']
|
|
7
7
|
s.homepage = 'https://github.com/jhaals/tutter-sppuppet'
|