git_pr 0.0.12 → 0.0.13.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0ab27aaf12b0313a7a4eb7f403733583817a13
-  data.tar.gz: 8f4884c4c2b568bc474c9004de0ac301d9650df9
+  metadata.gz: 2cb9b6b023a2ac2b8f11dce7b92aec1b930b751a
+  data.tar.gz: c77bac089064b8f6b0ea371b88ec632b627ea84f
 SHA512:
-  metadata.gz: 177b310e62d62e27f16254bca171c0445e862101c67a5bb1f7f02de26f130e7b19702a98802ab5270bc46977ca7d05af329763b93b76997699d2b67378b05227
-  data.tar.gz: 3fec0aececf8aac2cb84914f6a8ef21399b6945de72fc4a5e81fe1f41675cd67d8205e771aec3804dc1b59dcb96d252ceddaa6502a8a95d1874328d152d55ac8
+  metadata.gz: 5944e0e21eea65d50cb0926da86c92ff4fcc26c22468e1604d33f46eb820b2772f3d76a571176ba61d47037c98a8b5185b2bb9778c1005cea581c2548645b19c
+  data.tar.gz: 4552ce42759cbd9bce1a16e425a28f3cf03b80a595d03d4545911af233bfc24bb087b268d67c7c919cb605f41d6326bf28713a7c165c2a42a5e7744246eca9a8

data/lib/git_pr/merge.rb

@@ -105,7 +105,12 @@ module GitPr
     # merge commit is created.
     puts "Merging changes from '#{rebase_branch}' to '#{target_branch}'"
     GitPr.run_command "git checkout -q #{target_branch}"
-    GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape("Merge " + pull_summary(pull))}"
+    commit_message = <<EOS
+Merge #{pull_summary(pull)}
+
+#{pull[:body]}
+EOS
+    GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape commit_message}"
 
     # Print a log of the merge with branch structure visible. Jump through hoops to
     # get the right branch to start the log revision range with. If origin/develop

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.12"
+  VERSION = "0.0.13.beta.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13.beta.1
 platform: ruby
 authors:
 - Brian Sharon
@@ -159,9 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14