tutter-sppuppet 1.2.13 → 1.2.14

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
- SHA1:
3
- metadata.gz: b9d2d63bcf750eb492a1472be759d69ebc6f0eba
4
- data.tar.gz: c2c9233bc8080eb716e571d2b1dec3777d0c254e
2
+ SHA256:
3
+ metadata.gz: 47492aaf3dea7811621bd0421f96da8be13fa8199069ff723b0cbc1b0b0377d1
4
+ data.tar.gz: 744d717ae1aaa35fc754f563f34d6c0947d32f7de2d8ee969d9bbf1ad550a21d
5
5
  SHA512:
6
- metadata.gz: d20e87737126da0e99748133d28b787186d2117c04a340c2b2820f6acad5c369972e1c3f5ba00b604a5501370394cf4209afccb5d456f73ed121cac3a1c00e93
7
- data.tar.gz: a71f9367ad7d9257e467e14de894c7e006d26f563948649e3982e3c908df408c6d4f5726d6e5e4e1f9c3e978854547b5f53b809126d209a9ba936a55354a9224
6
+ metadata.gz: 49bfa276f025be48efccb546f59ee85d211ac025c682a187efc692c6140658e1b588386596c243da196d9aee1620736bfbd2431db9c4f32313214cf33d90b91a
7
+ data.tar.gz: e0be1ca0d52ebfd01698d847fb4dd823cb476698907a7e7dcccf1793fdc53562c0dc1b8ee3ce89c34221ceb422053ae513a4dd4ffcacba6c00e447bd98192dab
@@ -134,11 +134,12 @@ class Sppuppet
134
134
  end
135
135
  end
136
136
 
137
- if pr.mergeable_state != 'clean' && !incident_merge_override
138
- msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
139
- reassure = "I will try to merge this for you when the builds turn green\n" +
137
+ if pr.mergeable_state != 'clean' && pr.mergeable_state != 'has_hooks' && !incident_merge_override
138
+ msg = "Merge state is not clean. Current state: #{pr.mergeable_state}\n"
139
+ reassure = "I will try to merge this for you when the build turn green\n" +
140
140
  "If your build fails or becomes stuck for some reason, just say 'rebuild'\n" +
141
- 'If you have an incident and want to skip the tests or the peer review, please post the link to the jira ticket.'
141
+ "If you have an incident and want to skip the tests or the peer review, please post the link to the jira ticket.\n\n" +
142
+ 'If the pr is already merged according to github, you can ignore this message.'
142
143
  if merge_command
143
144
  return post_comment(pull_request_id, msg + reassure)
144
145
  else
@@ -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.2.13'
4
+ s.version = '1.2.14'
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'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tutter-sppuppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.13
4
+ version: 1.2.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Johan Haals
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-02-06 00:00:00.000000000 Z
13
+ date: 2018-09-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: tutter
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
66
66
  version: '0'
67
67
  requirements: []
68
68
  rubyforge_project:
69
- rubygems_version: 2.6.8
69
+ rubygems_version: 2.7.6
70
70
  signing_key:
71
71
  specification_version: 4
72
72
  summary: Github code review without collaborator access