mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 20:16:20 +01:00
Merge branch 'master' of github.com:gogits/gogs
This commit is contained in:
skyblue
commit
e75ab8cdbd
10 changed files with 674 additions and 49 deletions
|
|
@ -59,14 +59,18 @@ func (a Action) GetContent() string {
|
||||||
// CommitRepoAction records action for commit repository.
|
// CommitRepoAction records action for commit repository.
|
||||||
func CommitRepoAction(userId int64, userName string,
|
func CommitRepoAction(userId int64, userName string,
|
||||||
repoId int64, repoName string, refName string, commits *base.PushCommits) error {
|
repoId int64, repoName string, refName string, commits *base.PushCommits) error {
|
||||||
|
log.Trace("action.CommitRepoAction: %d/%s", userId, repoName)
|
||||||
|
|
||||||
bs, err := json.Marshal(commits)
|
bs, err := json.Marshal(commits)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("action.CommitRepoAction(json): %d/%s", userId, repoName)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add feeds for user self and all watchers.
|
// Add feeds for user self and all watchers.
|
||||||
watches, err := GetWatches(repoId)
|
watches, err := GetWatches(repoId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("action.CommitRepoAction(get watches): %d/%s", userId, repoName)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
watches = append(watches, Watch{UserId: userId})
|
watches = append(watches, Watch{UserId: userId})
|
||||||
|
|
@ -86,20 +90,23 @@ func CommitRepoAction(userId int64, userName string,
|
||||||
RepoName: repoName,
|
RepoName: repoName,
|
||||||
RefName: refName,
|
RefName: refName,
|
||||||
})
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Error("action.CommitRepoAction(notify watches): %d/%s", userId, repoName)
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update repository last update time.
|
// Update repository last update time.
|
||||||
repo, err := GetRepositoryByName(userId, repoName)
|
repo, err := GetRepositoryByName(userId, repoName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Error("action.CommitRepoAction(GetRepositoryByName): %d/%s", userId, repoName)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
repo.IsBare = false
|
repo.IsBare = false
|
||||||
if err = UpdateRepository(repo); err != nil {
|
if err = UpdateRepository(repo); err != nil {
|
||||||
|
log.Error("action.CommitRepoAction(UpdateRepository): %d/%s", userId, repoName)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Trace("action.CommitRepoAction: %d/%s", userId, repo.LowerName)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -261,6 +261,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
// hook/post-update
|
// hook/post-update
|
||||||
pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
|
pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -282,6 +283,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
|
||||||
if _, err = pu2.WriteString("#!/usr/bin/env bash\ngit update-server-info\n"); err != nil {
|
if _, err = pu2.WriteString("#!/usr/bin/env bash\ngit update-server-info\n"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// Initialize repository according to user's choice.
|
// Initialize repository according to user's choice.
|
||||||
fileName := map[string]string{}
|
fileName := map[string]string{}
|
||||||
|
|
@ -387,7 +389,7 @@ func UpdateRepository(repo *Repository) error {
|
||||||
repo.Website = repo.Website[:255]
|
repo.Website = repo.Website[:255]
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err := orm.Id(repo.Id).UseBool().Cols("description", "website", "updated").Update(repo)
|
_, err := orm.Id(repo.Id).AllCols().Update(repo)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,7 @@ func UpdateUser(user *User) (err error) {
|
||||||
user.Website = user.Website[:255]
|
user.Website = user.Website[:255]
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = orm.Id(user.Id).UseBool().Cols("email", "passwd", "avatar", "avatar_email", "website", "location", "is_active", "is_admin", "updated").Update(user)
|
_, err = orm.Id(user.Id).AllCols().Update(user)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ func newService() {
|
||||||
Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
|
Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newLogService() {
|
func NewLogService() {
|
||||||
// Get and check log mode.
|
// Get and check log mode.
|
||||||
LogMode = Cfg.MustValue("log", "MODE", "console")
|
LogMode = Cfg.MustValue("log", "MODE", "console")
|
||||||
modeSec := "log." + LogMode
|
modeSec := "log." + LogMode
|
||||||
|
|
@ -125,7 +125,7 @@ func newLogService() {
|
||||||
logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log")
|
logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log")
|
||||||
os.MkdirAll(path.Dir(logPath), os.ModePerm)
|
os.MkdirAll(path.Dir(logPath), os.ModePerm)
|
||||||
LogConfig = fmt.Sprintf(
|
LogConfig = fmt.Sprintf(
|
||||||
`{"level":%s,"filename":%s,"rotate":%v,"maxlines":%d,"maxsize",%d,"daily":%v,"maxdays":%d}`, level,
|
`{"level":%s,"filename":"%s","rotate":%v,"maxlines":%d,"maxsize":%d,"daily":%v,"maxdays":%d}`, level,
|
||||||
logPath,
|
logPath,
|
||||||
Cfg.MustBool(modeSec, "LOG_ROTATE", true),
|
Cfg.MustBool(modeSec, "LOG_ROTATE", true),
|
||||||
Cfg.MustInt(modeSec, "MAX_LINES", 1000000),
|
Cfg.MustInt(modeSec, "MAX_LINES", 1000000),
|
||||||
|
|
@ -133,20 +133,20 @@ func newLogService() {
|
||||||
Cfg.MustBool(modeSec, "DAILY_ROTATE", true),
|
Cfg.MustBool(modeSec, "DAILY_ROTATE", true),
|
||||||
Cfg.MustInt(modeSec, "MAX_DAYS", 7))
|
Cfg.MustInt(modeSec, "MAX_DAYS", 7))
|
||||||
case "conn":
|
case "conn":
|
||||||
LogConfig = fmt.Sprintf(`{"level":%s,"reconnectOnMsg":%v,"reconnect":%v,"net":%s,"addr":%s}`, level,
|
LogConfig = fmt.Sprintf(`{"level":"%s","reconnectOnMsg":%v,"reconnect":%v,"net":"%s","addr":"%s"}`, level,
|
||||||
Cfg.MustBool(modeSec, "RECONNECT_ON_MSG", false),
|
Cfg.MustBool(modeSec, "RECONNECT_ON_MSG", false),
|
||||||
Cfg.MustBool(modeSec, "RECONNECT", false),
|
Cfg.MustBool(modeSec, "RECONNECT", false),
|
||||||
Cfg.MustValue(modeSec, "PROTOCOL", "tcp"),
|
Cfg.MustValue(modeSec, "PROTOCOL", "tcp"),
|
||||||
Cfg.MustValue(modeSec, "ADDR", ":7020"))
|
Cfg.MustValue(modeSec, "ADDR", ":7020"))
|
||||||
case "smtp":
|
case "smtp":
|
||||||
LogConfig = fmt.Sprintf(`{"level":%s,"username":%s,"password":%s,"host":%s,"sendTos":%s,"subject":%s}`, level,
|
LogConfig = fmt.Sprintf(`{"level":"%s","username":"%s","password":"%s","host":"%s","sendTos":"%s","subject":"%s"}`, level,
|
||||||
Cfg.MustValue(modeSec, "USER", "example@example.com"),
|
Cfg.MustValue(modeSec, "USER", "example@example.com"),
|
||||||
Cfg.MustValue(modeSec, "PASSWD", "******"),
|
Cfg.MustValue(modeSec, "PASSWD", "******"),
|
||||||
Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
|
Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
|
||||||
Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
|
Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
|
||||||
Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
|
Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
|
||||||
case "database":
|
case "database":
|
||||||
LogConfig = fmt.Sprintf(`{"level":%s,"driver":%s,"conn":%s}`, level,
|
LogConfig = fmt.Sprintf(`{"level":"%s","driver":"%s","conn":"%s"}`, level,
|
||||||
Cfg.MustValue(modeSec, "Driver"),
|
Cfg.MustValue(modeSec, "Driver"),
|
||||||
Cfg.MustValue(modeSec, "CONN"))
|
Cfg.MustValue(modeSec, "CONN"))
|
||||||
}
|
}
|
||||||
|
|
@ -259,12 +259,17 @@ func NewConfigContext() {
|
||||||
Cfg.BlockMode = false
|
Cfg.BlockMode = false
|
||||||
|
|
||||||
cfgPath = filepath.Join(workDir, "custom/conf/app.ini")
|
cfgPath = filepath.Join(workDir, "custom/conf/app.ini")
|
||||||
if com.IsFile(cfgPath) {
|
if !com.IsFile(cfgPath) {
|
||||||
|
fmt.Println("Custom configuration not found(custom/conf/app.ini)\n" +
|
||||||
|
"Please create it and make your own configuration!")
|
||||||
|
os.Exit(2)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if err = Cfg.AppendFiles(cfgPath); err != nil {
|
if err = Cfg.AppendFiles(cfgPath); err != nil {
|
||||||
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service")
|
AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service")
|
||||||
AppLogo = Cfg.MustValue("", "APP_LOGO", "img/favicon.png")
|
AppLogo = Cfg.MustValue("", "APP_LOGO", "img/favicon.png")
|
||||||
|
|
@ -291,7 +296,7 @@ func NewConfigContext() {
|
||||||
|
|
||||||
func NewServices() {
|
func NewServices() {
|
||||||
newService()
|
newService()
|
||||||
newLogService()
|
NewLogService()
|
||||||
newCacheService()
|
newCacheService()
|
||||||
newSessionService()
|
newSessionService()
|
||||||
newMailService()
|
newMailService()
|
||||||
|
|
|
||||||
|
|
@ -711,6 +711,12 @@ html, body {
|
||||||
width: 1%;
|
width: 1%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.file-content .file-body.file-code .lines-ellipsis {
|
||||||
|
background-color: #FAFAFA;
|
||||||
|
color: #999;
|
||||||
|
width: 1%;
|
||||||
|
}
|
||||||
|
|
||||||
.file-content .file-body.file-code .lines-num span {
|
.file-content .file-body.file-code .lines-num span {
|
||||||
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
|
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
|
|
@ -798,7 +804,7 @@ html, body {
|
||||||
margin-left: .5em;
|
margin-left: .5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.commit-box .avatar {
|
.commit-box .avatar, .diff-head-box .avatar {
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
|
@ -831,10 +837,141 @@ html, body {
|
||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.guide-box {
|
.guide-box, .diff-head-box {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.diff-head-box h4 {
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 0;
|
||||||
|
line-height: 26px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-head-box p {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-head-box .sha {
|
||||||
|
margin-left: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-head-box a.name {
|
||||||
|
color: #444;
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-head-box span.time {
|
||||||
|
color: #888;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
line-height: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box span.status {
|
||||||
|
display: inline-block;
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
margin-right: 8px;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box ol {
|
||||||
|
padding-left: 0;
|
||||||
|
margin-bottom: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box li {
|
||||||
|
list-style: none;
|
||||||
|
padding-bottom: 4px;
|
||||||
|
margin-bottom: 4px;
|
||||||
|
border-bottom: 1px dashed #DDD;
|
||||||
|
padding-left: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box span.status.modify {
|
||||||
|
background-color: #f0db88;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box span.status.add {
|
||||||
|
background-color: #b4e2b4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box span.status.del {
|
||||||
|
background-color: #e9aeae;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-detail-box span.status.rename {
|
||||||
|
background-color: #dad8ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .panel-heading {
|
||||||
|
padding: 10px 20px;
|
||||||
|
line-height: 26px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-box .count {
|
||||||
|
margin-right: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-box .count .bar {
|
||||||
|
width: 40px;
|
||||||
|
display: inline-block;
|
||||||
|
margin: 2px 4px 0 4px;
|
||||||
|
vertical-align: text-top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-box .file {
|
||||||
|
color: #888;
|
||||||
|
}
|
||||||
|
|
||||||
|
#gogs-source .file-content.diff-file-box {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-box .count .bar .add {
|
||||||
|
background-color: #77c64a;
|
||||||
|
height: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-box .count .bar .del, .diff-box .count .bar {
|
||||||
|
background-color: #e75316;
|
||||||
|
height: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .file-body.file-code .lines-code > pre {
|
||||||
|
margin: 0;
|
||||||
|
padding: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .file-body.file-code .lines-num-old {
|
||||||
|
border-right: 1px solid #DDD;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .code-bin td {
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .code-diff tbody tr.add-code td, .diff-file-box .code-diff tbody tr.add-code pre {
|
||||||
|
background-color: #d1ffd6 !important;
|
||||||
|
border-color: #b4e2b4 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .code-diff tbody tr.del-code td, .diff-file-box .code-diff tbody tr.del-code pre {
|
||||||
|
background-color: #ffe2dd !important;
|
||||||
|
border-color: #e9aeae !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .code-diff tbody tr:hover td, .diff-file-box .code-diff tbody tr:hover pre {
|
||||||
|
background-color: #fff8d2 !important;
|
||||||
|
border-color: #f0db88 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.diff-file-box .ellipsis-code pre {
|
||||||
|
color: #AAA;
|
||||||
|
}
|
||||||
|
|
||||||
/* wrapper and footer */
|
/* wrapper and footer */
|
||||||
|
|
||||||
#wrapper {
|
#wrapper {
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ var Gogits = {
|
||||||
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
|
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
|
||||||
node.append('<a class="anchor" href="#' + name + '"><span class="octicon octicon-link"></span></a>');
|
node.append('<a class="anchor" href="#' + name + '"><span class="octicon octicon-link"></span></a>');
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
Gogits.renderCodeView = function () {
|
Gogits.renderCodeView = function () {
|
||||||
function selectRange($list, $select, $from) {
|
function selectRange($list, $select, $from) {
|
||||||
|
|
@ -334,6 +334,21 @@ function initRepository() {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// repo diff counter
|
||||||
|
(function () {
|
||||||
|
var $counter = $('.diff-counter');
|
||||||
|
if ($counter.length < 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$counter.each(function (i, item) {
|
||||||
|
var $item = $(item);
|
||||||
|
var addLine = $item.find('span[data-line].add').data("line");
|
||||||
|
var delLine = $item.find('span[data-line].del').data("line");
|
||||||
|
var addPercent = parseFloat(addLine) / (parseFloat(addLine) + parseFloat(delLine)) * 100;
|
||||||
|
$item.find(".bar .add").css("width", addPercent + "%");
|
||||||
|
});
|
||||||
|
}());
|
||||||
}
|
}
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
|
|
|
||||||
|
|
@ -33,3 +33,9 @@ func Commits(ctx *middleware.Context, params martini.Params) {
|
||||||
ctx.Data["Commits"] = commits
|
ctx.Data["Commits"] = commits
|
||||||
ctx.HTML(200, "repo/commits")
|
ctx.HTML(200, "repo/commits")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Diff(ctx *middleware.Context,params martini.Params){
|
||||||
|
ctx.Data["Title"] = "commit-sha"
|
||||||
|
ctx.Data["IsRepoToolbarCommits"] = true
|
||||||
|
ctx.HTML(200,"repo/diff")
|
||||||
|
}
|
||||||
|
|
|
||||||
7
serve.go
7
serve.go
|
|
@ -44,6 +44,10 @@ gogs serv provide access auth for repositories`,
|
||||||
Flags: []cli.Flag{},
|
Flags: []cli.Flag{},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
|
||||||
|
}
|
||||||
|
|
||||||
func parseCmd(cmd string) (string, string) {
|
func parseCmd(cmd string) (string, string) {
|
||||||
ss := strings.SplitN(cmd, " ", 2)
|
ss := strings.SplitN(cmd, " ", 2)
|
||||||
if len(ss) != 2 {
|
if len(ss) != 2 {
|
||||||
|
|
@ -68,6 +72,7 @@ func runServ(k *cli.Context) {
|
||||||
base.NewConfigContext()
|
base.NewConfigContext()
|
||||||
models.LoadModelsConfig()
|
models.LoadModelsConfig()
|
||||||
models.NewEngine()
|
models.NewEngine()
|
||||||
|
base.NewLogService()
|
||||||
|
|
||||||
keys := strings.Split(os.Args[2], "-")
|
keys := strings.Split(os.Args[2], "-")
|
||||||
if len(keys) != 2 {
|
if len(keys) != 2 {
|
||||||
|
|
@ -227,7 +232,7 @@ func runServ(k *cli.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if ref, ok = refs[refname]; !ok {
|
if ref, ok = refs[refname]; !ok {
|
||||||
println("unknow reference name -", refname, "-")
|
log.Trace("unknow reference name -", refname, "-", b.String())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
l, err = ref.AllCommits()
|
l, err = ref.AllCommits()
|
||||||
|
|
|
||||||
448
templates/repo/diff.tmpl
Normal file
448
templates/repo/diff.tmpl
Normal file
|
|
@ -0,0 +1,448 @@
|
||||||
|
{{template "base/head" .}}
|
||||||
|
{{template "base/navbar" .}}
|
||||||
|
{{template "repo/nav" .}}
|
||||||
|
{{template "repo/toolbar" .}}
|
||||||
|
<div id="gogs-body" class="container" data-page="repo">
|
||||||
|
<div id="gogs-source">
|
||||||
|
<div class="panel panel-info diff-box diff-head-box">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<a class="pull-right btn btn-primary btn-sm" href="#commit-source">Browse Source</a>
|
||||||
|
<h4>bsongen: support for custom tags</h4>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<span class="pull-right">
|
||||||
|
commit <span class="label label-default sha">commit-sha</span>
|
||||||
|
</span>
|
||||||
|
<p class="author">
|
||||||
|
<img class="avatar" src="#" alt=""/>
|
||||||
|
<a class="name" href="#"><strong>author-name</strong></a>
|
||||||
|
<span class="time">times-ago</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="diff-detail-box diff-box">
|
||||||
|
<a class="pull-right btn btn-default" data-toggle="collapse" data-target="#diff-files">Show Diff Files</a>
|
||||||
|
<p class="showing">
|
||||||
|
<i class="fa fa-retweet"></i>
|
||||||
|
<strong> 5 changed files</strong> with <strong>25 additions</strong> and <strong>9 deletions</strong>.
|
||||||
|
</p>
|
||||||
|
<ol class="detail-files collapse" id="diff-files">
|
||||||
|
<li>
|
||||||
|
<div class="diff-counter count pull-right">
|
||||||
|
<span class="add" data-line="2">2</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="4">4</span>
|
||||||
|
</div>
|
||||||
|
<!-- todo finish all file status, now modify, add, delete and rename -->
|
||||||
|
<span class="status modify" data-toggle="tooltip" data-placement="right" title="modify"> </span>
|
||||||
|
<a class="file" href="#diff-1">gopmweb.go</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<div class="diff-counter count pull-right">
|
||||||
|
<span class="add" data-line="666">666</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="44">44</span>
|
||||||
|
</div>
|
||||||
|
<span class="status add" data-toggle="tooltip" data-placement="right" title="add"> </span>
|
||||||
|
<a class="file" href="#diff-2">static/img/favicon.png</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<span class="status del" data-toggle="tooltip" data-placement="right" title="delete"> </span>
|
||||||
|
<a class="file" href="#diff-2">static/img/favicon.png</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<span class="status rename" data-toggle="tooltip" data-placement="right" title="rename"> </span>
|
||||||
|
<a class="file" href="#diff-2">static/img/favicon.png</a>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-1">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<div class="diff-counter count pull-left">
|
||||||
|
<span class="add" data-line="1">BIN</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="0"></span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-default btn-sm pull-right" href="#">View File</a>
|
||||||
|
<span class="file">data/test/bson_test/simple_type.png</span>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body file-body file-code code-view code-bin">
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr class="text-center"><td><img src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=200" alt=""/></td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-2">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<div class="diff-counter count pull-left">
|
||||||
|
<span class="add" data-line="30">+ 30</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="4">- 4</span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-default btn-sm pull-right" href="#">View File</a>
|
||||||
|
<span class="file">data/test/bson_test/simple_type.go</span>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body file-body file-code code-view code-diff">
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr class="same-code nl-1 ol-1">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">1</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">1</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-2 ol-2">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">2</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">2</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-3 ol-3">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L3">3</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L3">3</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="add-code nl-4 ol-0">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="add">+</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L4">4</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="add-code nl-5 ol-0">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="add">+</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L5">5</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-4">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L4">4</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-5">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L5">5</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-6">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L6">6</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-7">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L7">7</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-6 ol-8">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L8">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L6">6</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-7 ol-9">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">9</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">7</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-8 ol-10">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">10</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="panel panel-default diff-file-box diff-box file-content">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<div class="diff-counter count pull-left">
|
||||||
|
<span class="add" data-line="2">+ 2</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="4">- 4</span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-default btn-sm pull-right" href="#">View File</a>
|
||||||
|
<span class="file">data/test/bson_test/simple_type.go</span>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body file-body file-code code-view code-diff">
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr class="same-code nl-1 ol-1">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">1</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">1</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-2 ol-2">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">2</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">2</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-3 ol-3">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L3">3</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L3">3</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="add-code nl-4 ol-0">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="add">+</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L4">4</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="add-code nl-5 ol-0">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="add">+</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L5">5</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-4">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L4">4</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-5">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L5">5</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-6">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L6">6</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="del-code nl-0 ol-7">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L7">7</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="del">-</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-6 ol-8">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L8">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L6">6</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-7 ol-9">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">9</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">7</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-8 ol-10">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">10</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="ellipsis-code">
|
||||||
|
<td class="text-center lines-ellipsis" colspan="2">
|
||||||
|
<i class="fa fa-ellipsis-h"></i>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-8 ol-10">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">10</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="same-code nl-8 ol-10">
|
||||||
|
<td class="lines-num lines-num-old">
|
||||||
|
<span rel="L1">10</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-num lines-num-new">
|
||||||
|
<span rel="L1">8</span>
|
||||||
|
</td>
|
||||||
|
<td class="lines-code">
|
||||||
|
<pre> "github.com/youtube/vitess/go/bson"</pre>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="panel panel-default diff-file-box diff-box file-content">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<div class="diff-counter count pull-left">
|
||||||
|
<span class="add" data-line="0">BIN</span>
|
||||||
|
<span class="bar">
|
||||||
|
<span class="pull-left add"></span>
|
||||||
|
<span class="pull-left del"></span>
|
||||||
|
</span>
|
||||||
|
<span class="del" data-line="1"></span>
|
||||||
|
</div>
|
||||||
|
<a class="btn btn-default btn-sm pull-right" href="#">View File</a>
|
||||||
|
<span class="file">data/test/bson_test/simple_type.png</span>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body file-body file-code code-view code-bin">
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<tr class="text-center"><td><img src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=200" alt=""/></td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{template "base/footer" .}}
|
||||||
4
web.go
4
web.go
|
|
@ -157,8 +157,8 @@ func runWeb(*cli.Context) {
|
||||||
}, ignSignIn, middleware.RepoAssignment(true))
|
}, ignSignIn, middleware.RepoAssignment(true))
|
||||||
|
|
||||||
// TODO: implement single commit page
|
// TODO: implement single commit page
|
||||||
// m.Get("/:username/:reponame/commit/:commitid/**", ignSignIn, middleware.RepoAssignment(true), repo.Single)
|
m.Get("/:username/:reponame/commit/:commitid/**", ignSignIn, middleware.RepoAssignment(true), repo.Diff)
|
||||||
// m.Get("/:username/:reponame/commit/:commitid", ignSignIn, middleware.RepoAssignment(true), repo.Single)
|
m.Get("/:username/:reponame/commit/:commitid", ignSignIn, middleware.RepoAssignment(true), repo.Diff)
|
||||||
|
|
||||||
m.Group("/:username", func(r martini.Router) {
|
m.Group("/:username", func(r martini.Router) {
|
||||||
r.Get("/:reponame", middleware.RepoAssignment(true), repo.Single)
|
r.Get("/:reponame", middleware.RepoAssignment(true), repo.Single)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue