Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	routers/user/user.go
	web.go

1 files changed, 1 insertions, 0 deletions

diff --git a/models/action.go b/models/action.go
index 8008d331..6a77d730 100644
--- a/models/action.go
+++ b/models/action.go
@@ -56,6 +56,7 @@ func NewRepoAction(user *User, repo *Repository) error {
 	return err
 }
 
+// GetFeeds returns action list of given user in given context.
 func GetFeeds(userid, offset int64, isProfile bool) ([]Action, error) {
 	actions := make([]Action, 0, 20)
 	sess := orm.Limit(20, int(offset)).Desc("id").Where("user_id=?", userid)