From 3d8e04c04ffaeb6383e4de81f9be72b59f21c3cf Mon Sep 17 00:00:00 2001 From: Kirill Zaitsev Date: Thu, 2 Oct 2014 18:22:42 +0400 Subject: [PATCH 1/2] Use :host instead :hook, host is required by hook handler --- server/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/main.go b/server/main.go index b58a593b9..38fea57eb 100644 --- a/server/main.go +++ b/server/main.go @@ -120,11 +120,12 @@ func main() { goji.Get("/api/stream/stdout/:id", handler.WsConsole) goji.Get("/api/stream/user", handler.WsUser) goji.Get("/api/auth/:host", handler.GetLogin) + goji.Get("/api/auth/:host", handler.GetLogin) goji.Get("/api/badge/:host/:owner/:name/status.svg", handler.GetBadge) goji.Get("/api/badge/:host/:owner/:name/cc.xml", handler.GetCC) - goji.Get("/api/hook/:hook", handler.PostHook) - goji.Put("/api/hook/:hook", handler.PostHook) - goji.Post("/api/hook/:hook", handler.PostHook) + goji.Get("/api/hook/:host", handler.PostHook) + goji.Put("/api/hook/:host", handler.PostHook) + goji.Post("/api/hook/:host", handler.PostHook) repos := web.New() repos.Use(middleware.SetRepo) From d1f8486862ee004205278c6946560fc616a6400a Mon Sep 17 00:00:00 2001 From: Kirill Zaitsev Date: Thu, 2 Oct 2014 18:11:13 +0400 Subject: [PATCH 2/2] Fix fetch commits in repo page --- server/app/scripts/controllers/repo.js | 4 ++-- server/app/scripts/services/repo.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/app/scripts/controllers/repo.js b/server/app/scripts/controllers/repo.js index 34d16298a..2c1892f85 100644 --- a/server/app/scripts/controllers/repo.js +++ b/server/app/scripts/controllers/repo.js @@ -23,8 +23,8 @@ angular.module('app').controller("RepoController", function($scope, $http, $rout // load the repo commit feed - repos.feed(repo.host, repo.owner, repo.name).success(function (feed) { - $scope.commits = (typeof feed==='string')?[]:feed; + repos.commits(repo.host, repo.owner, repo.name).success(function (commits) { + $scope.commits = (typeof commits==='string')?[]:commits; $scope.state = 1; }) .error(function (error) { diff --git a/server/app/scripts/services/repo.js b/server/app/scripts/services/repo.js index 3f842067a..ab7f2385e 100644 --- a/server/app/scripts/services/repo.js +++ b/server/app/scripts/services/repo.js @@ -20,8 +20,8 @@ angular.module('app').service('repos', ['$q', '$http', function($q, $http) { }; // Gets a repository by host, owner and name. - this.feed = function(host, owner, name) { - return $http.get('/api/repos/'+host+'/'+owner+'/'+name+'/feed'); + this.commits = function(host, owner, name) { + return $http.get('/api/repos/'+host+'/'+owner+'/'+name+'/commits'); }; // Updates an existing repository