Browse Source

Fix #166

tags/v1.2.0-rc1
Unknown 11 years ago
parent
commit
98dbbae2ef
6 changed files with 7 additions and 6 deletions
  1. +1
    -1
      README.md
  2. +1
    -1
      README_ZH.md
  3. +1
    -1
      gogs.go
  4. +2
    -0
      models/git_diff.go
  5. +0
    -1
      modules/middleware/repo.go
  6. +2
    -2
      templates/repo/diff.tmpl

+ 1
- 1
README.md View File

@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language

![Demo](http://gowalker.org/public/gogs_demo.gif)

##### Current version: 0.3.3 Alpha
##### Current version: 0.3.4 Alpha

### NOTICES



+ 1
- 1
README_ZH.md View File

@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。

![Demo](http://gowalker.org/public/gogs_demo.gif)

##### 当前版本:0.3.3 Alpha
##### 当前版本:0.3.4 Alpha

## 开发目的



+ 1
- 1
gogs.go View File

@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/base"
)

const APP_VER = "0.3.3.0512 Alpha"
const APP_VER = "0.3.4.0513 Alpha"

func init() {
base.AppVer = APP_VER


+ 2
- 0
models/git_diff.go View File

@@ -49,6 +49,7 @@ type DiffSection struct {

type DiffFile struct {
Name string
Index int
Addition, Deletion int
Type int
IsBin bool
@@ -144,6 +145,7 @@ func ParsePatch(reader io.Reader) (*Diff, error) {

curFile = &DiffFile{
Name: a[strings.Index(a, "/")+1:],
Index: len(diff.Files) + 1,
Type: DIFF_FILE_CHANGE,
Sections: make([]*DiffSection, 0, 10),
}


+ 0
- 1
modules/middleware/repo.go View File

@@ -226,7 +226,6 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {

ctx.Data["IsBranch"] = ctx.Repo.IsBranch
ctx.Data["IsCommit"] = ctx.Repo.IsCommit
log.Debug("Repo.Commit: %v", ctx.Repo.Commit)
}

log.Debug("displayBare: %v; IsBare: %v", displayBare, ctx.Repo.Repository.IsBare)


+ 2
- 2
templates/repo/diff.tmpl View File

@@ -51,14 +51,14 @@
</div>
<!-- todo finish all file status, now modify, add, delete and rename -->
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}">&nbsp;</span>
<a class="file" href="#diff-1">{{.Name}}</a>
<a class="file" href="#diff-{{.Index}}">{{.Name}}</a>
</li>
{{end}}
</ol>
</div>

{{range .Diff.Files}}
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-2">
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-{{.Index}}">
<div class="panel-heading">
<div class="diff-counter count pull-left">
{{if not .IsBin}}


Loading…
Cancel
Save