mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-07-04 21:15:47 +00:00
Code Issues Projects Releases Wiki Activity

Use TrimSpace

Browse source
This commit is contained in:
Nurahmadie 2014-03-31 11:29:07 +00:00
parent 0d44a20c63
commit 07071119ca
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/handler/gitlab.go
View file

@ -49,7 +49,7 @@ func (g *GitlabHandler) Add(w http.ResponseWriter, r *http.Request, u *User) err
} }
func (g *GitlabHandler) Link(w http.ResponseWriter, r *http.Request, u *User) error { func (g *GitlabHandler) Link(w http.ResponseWriter, r *http.Request, u *User) error {
token := strings.Trim(r.FormValue("token"), " \n\t") token := strings.TrimSpace(r.FormValue("token"))
if len(u.GitlabToken) == 0 || token != u.GitlabToken && len(token) > 0 { if len(u.GitlabToken) == 0 || token != u.GitlabToken && len(token) > 0 {
u.GitlabToken = token u.GitlabToken = token
@ -156,7 +156,7 @@ func (g *GitlabHandler) Hook(w http.ResponseWriter, r *http.Request) error {
return err return err
} }
if parsed.ObjectKind == "merge_request" { if parsed.ObjectKind == "merge_request" {
return g.PullRequestHook(parsed) return g.PullRequestHook(w, parsed)
} }
if len(parsed.After) == 0 { if len(parsed.After) == 0 {
@ -236,19 +236,15 @@ func (g *GitlabHandler) Hook(w http.ResponseWriter, r *http.Request) error {
return RenderText(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) return RenderText(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
} }
// notify websocket that a new build is pending g.queue.Add(&queue.BuildTask{Repo: repo, Commit: commit, Build: build, Script: buildscript})
//realtime.CommitPending(repo.UserID, repo.TeamID, repo.ID, commit.ID, repo.Private)
//realtime.BuildPending(repo.UserID, repo.TeamID, repo.ID, commit.ID, build.ID, repo.Private)
g.queue.Add(&queue.BuildTask{Repo: repo, Commit: commit, Build: build, Script: buildscript}) //Push(repo, commit, build, buildscript)
// OK! // OK!
return RenderText(w, http.StatusText(http.StatusOK), http.StatusOK) return RenderText(w, http.StatusText(http.StatusOK), http.StatusOK)
} }
func (g *GitlabHandler) PullRequestHook(p *gogitlab.HookPayload) error { func (g *GitlabHandler) PullRequestHook(w http.ResponseWriter, p *gogitlab.HookPayload) error {
return fmt.Errorf("Not implemented yet") return RenderText(w, http.StatusText(http.StatusOK), http.StatusOK)
} }
// ns namespaces user and repo. // ns namespaces user and repo.