fix #741

diff --git a/.gopmfile b/.gopmfile
index ef3e3b4ffcb64fa0b345ebfcfdcabbcf824f93db..49b4171550c62358aded827855d63c1b7252a029 100644 (file)
--- a/.gopmfile
+++ b/.gopmfile
@@ -5,7 +5,7 @@ path = github.com/gogits/gogs
 github.com/beego/memcache = commit:2aea774416
 github.com/beego/redigo = commit:856744a0d5
 github.com/Unknwon/cae = commit:2e70a1351b
-github.com/Unknwon/com = commit:2cbcbc6916
+github.com/Unknwon/com = 
 github.com/Unknwon/goconfig = commit:0f8d8dc1c0
 github.com/Unknwon/i18n = commit:aec5f77857
 github.com/Unknwon/macaron = commit:3d307c1232
@@ -16,7 +16,7 @@ github.com/go-xorm/xorm = commit:58d33844ce
 github.com/gogits/go-gogs-client = commit:92e76d616a
 github.com/gogits/oauth2 = commit:99cbec870a
 github.com/lib/pq = commit:b021d0ef20
-github.com/macaron-contrib/binding = commit:0e23661e7d
+github.com/macaron-contrib/binding = 
 github.com/macaron-contrib/cache = commit:0bb9e6c9ef
 github.com/macaron-contrib/captcha = commit:3567dc48b8
 github.com/macaron-contrib/csrf = commit:422b79675c

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1917ae8854edce9d41329c594d04be5f9dd3c23f..ea713ca4550dd0f8d19f5e50ba57e07141b975fd 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,8 +64,17 @@ Before open any new issue, please check your problem on [Troubleshooting](http:/
 
 Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) or card on [Trello](https://trello.com/b/uxAoeLUl/gogs-go-git-service) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
 
-### Discuss your design on the mailing list
+## Code of conduct
 
-We recommend discussing your plans [on the mailing list](https://groups.google.com/forum/#!forum/gogits) before starting to code - especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give feedback on your design, and maybe point out if someone else is working on the same thing.
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
 
-We may close your pull request if not first discussed on the mailing list. We aren't doing this to be jerks. We are doing this to prevent people from spending large amounts of time on changes that may need to be designed or architected in a specific way, or may not align with the vision of the project.
\ No newline at end of file
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior can be
+reported by emailing contact@gitlab.com
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
\ No newline at end of file

diff --git a/gogs.go b/gogs.go
index c117d4ff603b4dd03e006a304a2d3ef80328b896..9c0d4b54e63656805d91ba8339b8acc2bac28f80 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.9.1215 Beta"
+const APP_VER = "0.5.9.1216 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/routers/repo/view.go b/routers/repo/view.go
index 2fb411589aea64371b9f16254ded96b601d49042..3722f04b4480421ceae3e9d64fbc968c96ec4654 100644 (file)
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -154,8 +154,12 @@ func Home(ctx *middleware.Context) {
 
                // Render issue index links.
                for _, f := range files {
-                       c := f[1].(*git.Commit)
-                       c.CommitMessage = string(base.RenderIssueIndexPattern([]byte(c.CommitMessage), ctx.Repo.RepoLink))
+                       switch c := f[1].(type) {
+                       case *git.Commit:
+                               c.CommitMessage = string(base.RenderIssueIndexPattern([]byte(c.CommitMessage), ctx.Repo.RepoLink))
+                       case *git.SubModuleFile:
+                               c.CommitMessage = string(base.RenderIssueIndexPattern([]byte(c.CommitMessage), ctx.Repo.RepoLink))
+                       }
                }
                ctx.Data["Files"] = files
 

diff --git a/templates/.VERSION b/templates/.VERSION
index 4e6350ff43c8aa09120961d5f28449211d65a023..e72ad157a1b2c79f504b8be349da7cd0bb390460 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.9.1215 Beta
\ No newline at end of file
+0.5.9.1216 Beta
\ No newline at end of file