Merge pull request #1 from meinto/master

Rebase

Author: deroke

README.md

@@ -107,6 +107,7 @@ glow init
   "projectName": "my-project",
   "gitPath": "/usr/local/bin/git",
   "useBuiltInGitBindings": false,
+  "mergeRequest.squashCommits": true
 }
 ```
 

VERSION

@@ -1 +1 @@
-2.3.4
+2.3.5

formula/glow.rb

@@ -2,16 +2,16 @@
 class Glow < Formula
   desc ""
   homepage ""
-  version "2.3.3"
+  version "2.3.5"
   bottle :unneeded
 
   if OS.mac?
-    url "https://github.com/meinto/glow/releases/download/v2.3.3/glow_2.3.3_darwin_x86_64.tar.gz"
-    sha256 "2c3438a9821441a959bc17eb43a42055605859880bc7dbed8b342aa976f80869"
+    url "https://github.com/meinto/glow/releases/download/v2.3.5/glow_2.3.5_darwin_x86_64.tar.gz"
+    sha256 "12101247edece27ae57dca585b11b70c29549e4e0b392928dda9e76009783ce6"
   elsif OS.linux?
     if Hardware::CPU.intel?
-      url "https://github.com/meinto/glow/releases/download/v2.3.3/glow_2.3.3_linux_x86_64.tar.gz"
-      sha256 "ac07b9942beb6cfeb7b4d05f90fff684bd7a9dccceba96f0c9eb605aa56da361"
+      url "https://github.com/meinto/glow/releases/download/v2.3.5/glow_2.3.5_linux_x86_64.tar.gz"
+      sha256 "8c08b5b23ceb4b6cb7e2727c03bc20eb7db08ddeb93a80b844233f990a899786"
     end
   end
 

gitprovider/gitlab_adapter.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/meinto/glow"
 	"github.com/pkg/errors"
+	"github.com/spf13/viper"
 )
 
 type gitlabAdapter struct {
@@ -27,7 +28,7 @@ func (a *gitlabAdapter) Close(b glow.Branch) error {
 		targets := b.CloseBranches(branchList)
 
 		for _, t := range targets {
-			err := a.createMergeRequest(b, t)
+			err := a.createMergeRequest(b, t, true)
 			if err != nil {
 				return errors.Wrap(err, "error creating merge request")
 			}
@@ -41,24 +42,26 @@ func (a *gitlabAdapter) Publish(b glow.Branch) error {
 	remoteBranchExists := a.gitService.RemoteBranchExists(b.ShortBranchName())
 	if b.CanBePublished() && remoteBranchExists == nil {
 		t := b.PublishBranch()
-		return a.createMergeRequest(b, t)
+		return a.createMergeRequest(b, t, false)
 	}
 	return errors.Wrap(remoteBranchExists, "cannot be published")
 }
 
-func (a *gitlabAdapter) createMergeRequest(source glow.Branch, target glow.Branch) error {
+func (a *gitlabAdapter) createMergeRequest(source glow.Branch, target glow.Branch, removeSourceBranch bool) error {
 	type Payload struct {
 		SourceBranch       string `json:"source_branch"`
 		TargetBranch       string `json:"target_branch"`
 		Title              string `json:"title"`
 		RemoveSourceBranch bool   `json:"remove_source_branch"`
+		Squash             bool   `json:"squash"`
 	}
 
 	data := Payload{
 		SourceBranch:       source.ShortBranchName(),
 		TargetBranch:       target.ShortBranchName(),
 		Title:              fmt.Sprintf("Merge %s in %s", source.ShortBranchName(), target.ShortBranchName()),
-		RemoveSourceBranch: false,
+		RemoveSourceBranch: removeSourceBranch,
+		Squash:             viper.GetBool("mergeRequest.squashCommits"),
 	}
 	payloadBytes, err := json.Marshal(data)
 	if err != nil {

glow.config.json

@@ -3,5 +3,6 @@
   "gitProviderDomain": "https://api.github.com",
   "gitProvider": "github",
   "projectNamespace": "meinto",
-  "projectName": "glow"
+  "projectName": "glow",
+  "mergeRequest.squashCommits": true
 }