diff --git a/server/app/scripts/controllers/repo.js b/server/app/scripts/controllers/repo.js index 14385338..d585600b 100644 --- a/server/app/scripts/controllers/repo.js +++ b/server/app/scripts/controllers/repo.js @@ -24,8 +24,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 3f842067..ab7f2385 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 diff --git a/server/main.go b/server/main.go index b58a593b..38fea57e 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)