Merge method

[davidx]

This allows you to specify merge_method in the config, to be used on the final merge request.
It also changes the default merge_method to squash, which was 'merge' before.

example with setting:

merge_method: squash # default

davidx/prtester#313

https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button

[thumbot]

Thanks @davidx!

Settings

---
minimum_reviewers: 1
build_steps:
- bundle install
- bundle exec ruby test/test.rb
merge: true
org_mode: true
timeout: 1805
shell: "/bin/bash"
env:
  BUNDLE_GEMFILE: Gemfile

[thumbot]

merge_method 0d0d280	➡️	master 6e2b742	✅ completed

Looks good! 👍

✅ MERGE

Started at: 2016-12-08 23:57
Duration: 0 seconds.
Result: OK
Message: Merge Success: merge_method 0d0d280 onto target branch: master 6e2b742
Exit Code: OK

📄

  Updating 6e2b742..0d0d280
Fast-forward (no commit created; -m option ignored)
 lib/thumbs/pull_request_worker.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

---

✅ BUNDLE_INSTALL

Started at: 2016-12-08 23:57
Duration: 0 seconds.
Result: OK
Message: OK
Exit Code: 0

📄

cd /tmp/thumbs/master.6e2b742.merge_method.0d0d280; bundle install




  Using rake 12.0.0
Using concurrent-ruby 1.0.2
Using i18n 0.7.0
Using minitest 5.10.1
Using thread_safe 0.3.5
Using builder 3.2.2
Using erubis 2.7.0
Using mini_portile2 2.1.0
Using rack 2.0.1
Using public_suffix 2.0.4
Using mime-types-data 3.2016.0521
Using safe_yaml 1.0.4
Using diff-lcs 1.2.5
Using unf_ext 0.0.7.2
Using dust 0.1.6
Using excon 0.54.0
Using multipart-post 2.0.0
Using git 1.3.0
Using graphql 1.1.0
Using hashdiff 0.3.1
Using hijack 0.2.1
Using http-form_data 1.0.1
Using http_parser.rb 0.6.0
Using kgio 2.10.0
Using log4r 1.1.10
Using method_source 0.8.2
Using mustermann 1.0.0.beta2
Using netrc 0.11.0
Using power_assert 0.4.1
Using thor 0.19.4
Using raindrops 0.17.0
Using rspec-support 3.5.0
Using tilt 2.0.5
Using vcr 3.0.3
Using bundler 1.13.6
Using tzinfo 1.2.2
Using nokogiri 1.6.8.1
Using rack-test 0.6.3
Using rack-protection 2.0.0.beta2
Using addressable 2.5.0
Using mime-types 3.1
Using crack 0.4.3
Using unf 0.1.4
Using faraday 0.10.0
Using test-unit 3.2.3
Using unicorn 5.2.0
Using rspec-core 3.5.4
Using rspec-expectations 3.5.0
Using rspec-mocks 3.5.0
Using activesupport 5.0.0.1
Using loofah 2.0.3
Using xpath 2.0.0
Using sinatra 2.0.0.beta2
Using webmock 2.3.1
Using domain_name 0.5.20161129
Using sawyer 0.8.1
Using rails-dom-testing 2.0.1
Using graphql-client 0.2.3
Using rails-html-sanitizer 1.0.3
Using capybara 2.11.0
Using http-cookie 1.0.3
Using octokit 4.6.2
Using actionview 5.0.0.1
Using http 2.1.0
Using actionpack 5.0.0.1
Using railties 5.0.0.1
Using rspec-rails 3.5.2
Bundle complete! 22 Gemfile dependencies, 67 gems now installed.
Use `bundle show [gemname]` to see where a bundled gem is installed.

---

✅ BUNDLE_EXEC_RUBY_TEST/TEST.RB

Started at: 2016-12-08 23:57
Duration: 293 seconds.
Result: OK
Message: OK
Exit Code: 0

📄

cd /tmp/thumbs/master.6e2b742.merge_method.0d0d280; bundle exec ruby test/test.rb




  /tmp/thumbs/master.6e2b742.merge_method.0d0d280/test/test_common.rb:127: warning: key :record is duplicated and overwritten on line 127
Loaded suite test/test
Started
...........................................................................

Finished in 285.406138621 seconds.
------
75 tests, 203 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
100% passed
------
0.26 tests/s, 0.71 assertions/s

---

⬜ 0 of 1 Code reviews from organization basho-labs

[paegun]

+1

[thumbot]

✅ 1 of 1 Code reviews from organization basho-labs

• @paegun: +1

[thumbot]

Merging and closing this pr

[thumbot]

Successfully merged basho-labs/thumbs/pulls/62 (0d0d280 on to master)

---
:sha: c035c9e15dc39c4a0134aa36f0d9609edbf1c1e9
:merged: true
:message: Pull Request successfully merged