summaryrefslogtreecommitdiff
path: root/internal/command
diff options
context:
space:
mode:
authorIgor <idrozdov@gitlab.com>2020-01-02 07:46:58 +0000
committerIgor <idrozdov@gitlab.com>2020-01-02 07:46:58 +0000
commit607c7e37fa4dae90a8d96ffbe6d552b63aa2ecca (patch)
tree9ce1cb7664305a335170f6d76a2447ff266da911 /internal/command
parent8744864ac7ceda1e5125057db30119b813e4ddb9 (diff)
parentd5547156c3260e807453634bb5ea3edbbea0fef8 (diff)
downloadgitlab-shell-607c7e37fa4dae90a8d96ffbe6d552b63aa2ecca.tar.gz
Merge branch '210-remove-action-custom-inform_client-once-12-3-has-been-released' into 'master'
Remove support for Custom data.info_message Closes #210 See merge request gitlab-org/gitlab-shell!356
Diffstat (limited to 'internal/command')
-rw-r--r--internal/command/receivepack/customaction.go4
-rw-r--r--internal/command/receivepack/customaction_test.go2
2 files changed, 0 insertions, 6 deletions
diff --git a/internal/command/receivepack/customaction.go b/internal/command/receivepack/customaction.go
index 7575ee9..6693d23 100644
--- a/internal/command/receivepack/customaction.go
+++ b/internal/command/receivepack/customaction.go
@@ -7,9 +7,7 @@ import (
"io"
"io/ioutil"
"net/http"
- "strings"
- "gitlab.com/gitlab-org/gitlab-shell/internal/console"
"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet"
"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/accessverifier"
)
@@ -33,8 +31,6 @@ func (c *Command) processCustomAction(response *accessverifier.Response) error {
return errors.New("Custom action error: Empty API endpoints")
}
- console.DisplayInfoMessages(strings.Split(data.InfoMessage, "\n"), c.ReadWriter.ErrOut)
-
return c.processApiEndpoints(response)
}
diff --git a/internal/command/receivepack/customaction_test.go b/internal/command/receivepack/customaction_test.go
index 11e7dce..c55a8f3 100644
--- a/internal/command/receivepack/customaction_test.go
+++ b/internal/command/receivepack/customaction_test.go
@@ -41,7 +41,6 @@ func TestCustomReceivePack(t *testing.T) {
"api_endpoints": []string{"/geo/proxy_git_push_ssh/info_refs", "/geo/proxy_git_push_ssh/push"},
"gl_username": "custom",
"primary_repo": "https://repo/path",
- "info_message": "info_message\none more message",
},
},
}
@@ -100,6 +99,5 @@ func TestCustomReceivePack(t *testing.T) {
// expect printing of info message, "custom" string from the first request
// and "output" string from the second request
- require.Equal(t, "remote: \nremote: info_message\nremote: one more message\nremote: \n", errBuf.String())
require.Equal(t, "customoutput", outBuf.String())
}