ruboty-bitbucket_merge 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/README.md +0 -6
- data/lib/ruboty/bitbucket_merge/actions/merge_branch.rb +4 -2
- data/lib/ruboty/bitbucket_merge/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 252a8be6fb175ce29e965bfc7d3270642a4cb835
|
|
4
|
+
data.tar.gz: 5a22865874a9c4506ca5f6b716c90d07ef7d542b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2db993092cbccf3cda5171b14a5cccb56c19a5e6195a893daf9f16fc889b5d5603e226a0cb9fc9132cd7a363092c607d8692555ca60dc7992c5a0b01b831799a
|
|
7
|
+
data.tar.gz: 26c5ad8cba8c28d960b57751776ed99e936b94f6da7fe6e3f8d5f830e0c64de47e8c207435bbff34f6f7982f6c1b01c671a4a247ac02d4771f0af1333c89a36b
|
data/README.md
CHANGED
|
@@ -26,12 +26,6 @@ botname bb-br-merge master release myaccount/myrepo
|
|
|
26
26
|
|BITBUCKET_PASSWORD|your Bitbucket password|
|
|
27
27
|
|BITBUCKET_EMAIL|your Bitbucket e-mail|
|
|
28
28
|
|
|
29
|
-
## Dependency
|
|
30
|
-
|
|
31
|
-
|Name|Description|
|
|
32
|
-
|:--|:--|
|
|
33
|
-
|||
|
|
34
|
-
|
|
35
29
|
## Contributing
|
|
36
30
|
|
|
37
31
|
1. Fork it ( https://github.com/xoyip/ruboty-bitbucket_merge/fork )
|
|
@@ -15,11 +15,13 @@ module Ruboty
|
|
|
15
15
|
|
|
16
16
|
begin
|
|
17
17
|
pr_id, links = create_pull_request
|
|
18
|
+
message.reply("nothing to merge.") and return if pr_id.nil?
|
|
18
19
|
merge_message = build_merge_message(links["commits"]["href"])
|
|
19
20
|
merge_pull_request(links["merge"]["href"], pr_id, merge_message)
|
|
21
|
+
|
|
20
22
|
message.reply("Successfully merged.\n\n" + merge_message)
|
|
21
|
-
rescue
|
|
22
|
-
message.reply("Failed to merge.")
|
|
23
|
+
rescue => e
|
|
24
|
+
message.reply("Failed to merge. #{e}")
|
|
23
25
|
end
|
|
24
26
|
end
|
|
25
27
|
|