mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-23 08:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/exp' into exp

Browse source
This commit is contained in:
Brad Rydzewski 2014-08-07 21:19:44 -07:00
commit c1b1ded873
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/app/scripts/filters/filters.js
View file

@ -33,7 +33,7 @@ angular.module('app').filter('fullName', function() {
angular.module('app').filter('fullPath', function() { angular.module('app').filter('fullPath', function() {
return function(repo) { return function(repo) {
if (repo == undefined) { return ""; } if (repo == undefined) { return ""; }
return repo.remote+"/"+repo.owner+"/"+repo.name; return repo.host+"/"+repo.owner+"/"+repo.name;
} }
}); });
@ -104,4 +104,4 @@ angular.module('app').filter('unique', function() {
} }
return uniqueList; return uniqueList;
}; };
}); });

2
server/handler/hook.go
View file

@ -1,6 +1,7 @@
package handler package handler
import ( import (
"log"
"net/http" "net/http"
"strings" "strings"
@ -28,6 +29,7 @@ func NewHookHandler(users database.UserManager, repos database.RepoManager, comm
// GET /hook/:host // GET /hook/:host
func (h *HookHandler) PostHook(w http.ResponseWriter, r *http.Request) error { func (h *HookHandler) PostHook(w http.ResponseWriter, r *http.Request) error {
host := r.FormValue(":host") host := r.FormValue(":host")
log.Println("received post-commit hook.")
remoteServer, err := h.remotes.FindType(host) remoteServer, err := h.remotes.FindType(host)
if err != nil { if err != nil {