darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Brad Rydzewski 2014-10-05 15:31:13 -07:00
commit e4219a3aac
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/app/scripts/controllers/repo.js
View file

@ -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) {

4
server/app/scripts/services/repo.js
View file

@ -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

7
server/main.go
View file

@ -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)