diff --git a/pkg/database/migrate/20140328201430_add_gitlab_columns.go b/pkg/database/migrate/20140328201430_add_gitlab_columns.go index f47013903..d1948a092 100644 --- a/pkg/database/migrate/20140328201430_add_gitlab_columns.go +++ b/pkg/database/migrate/20140328201430_add_gitlab_columns.go @@ -25,7 +25,11 @@ func (r *rev20140328201430) Up(mg *MigrationDriver) error { return err } - _, err := mg.AddColumn("users", mg.T.String("gitlab_token")) + if _, err := mg.AddColumn("users", mg.T.String("gitlab_token")); err != nil { + return err + } + + _, err := mg.Tx.Exec(`update users set gitlab_token=?`, "") return err } diff --git a/pkg/handler/gitlab.go b/pkg/handler/gitlab.go index 9aa73b546..4419cac8e 100644 --- a/pkg/handler/gitlab.go +++ b/pkg/handler/gitlab.go @@ -3,6 +3,7 @@ package handler import ( "database/sql" "fmt" + "io/ioutil" "net/http" "time" @@ -140,11 +141,7 @@ func (g *GitlabHandler) newGitlabRepo(u *User, owner, name string) (*Repo, error } func (g *GitlabHandler) Hook(w http.ResponseWriter, r *http.Request) error { - var payload []byte - n, err := r.Body.Read(payload) - if n == 0 { - return fmt.Errorf("Request Empty: %q", err) - } + payload, _ := ioutil.ReadAll(r.Body) parsed, err := gogitlab.ParseHook(payload) if err != nil { return err