瀏覽代碼

#1545 Cross reference the commit from the issue when it is closed by the commit

Unknwon 9 年之前
父節點
當前提交
9b9e5f0290

+ 1 - 0
conf/locale/locale_en-US.ini

@@ -439,6 +439,7 @@ issues.reopen_comment_issue = Reopen and comment
 issues.create_comment = Comment
 issues.closed_at = `closed <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at = `reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.poster = Poster
 issues.admin = Admin
 issues.owner = Owner

文件差異過大導致無法顯示
+ 0 - 0
modules/bindata/bindata.go


文件差異過大導致無法顯示
+ 0 - 0
public/css/gogs.min.css


+ 14 - 0
public/less/_repository.less

@@ -235,6 +235,20 @@
 		    		font-size: 35px;
 		    		color: #6cc644;
 		    	}
+		    	&.octicon-bookmark {
+		    		margin-top: 3px;
+		    		font-size: 25px;
+		    	}
+		    }
+		    .detail {
+		    	font-size: 0.9rem;
+		    	margin-top: 5px;
+		    	margin-left: 35px;
+		    	.octicon {
+		    		&.octicon-git-commit {
+		    			margin-top: 2px;
+		    		}
+		    	}
 		    }
 			}
 		}

+ 13 - 0
templates/repo/issue/view_content.tmpl

@@ -143,6 +143,19 @@
   			  <img src="{{.Poster.AvatarLink}}">
   			</a>
   			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
+  		</div>
+  		{{else if eq .Type 4}}
+  		<div class="event">
+  			<span class="octicon octicon-bookmark"></span>
+  			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
+  			  <img src="{{.Poster.AvatarLink}}">
+  			</a>
+  			<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
+
+	  		<div class="detail">
+	  			<span class="octicon octicon-git-commit"></span>
+	  			<span class="text grey">{{.Content | Safe}}</span>
+	  		</div>
   		</div>
 			{{end}}
 

+ 4 - 5
templates/status/401.tmpl

@@ -1,6 +1,5 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div class="container">
-	401 Unauthorized: {{.ErrorMsg}}
+{{template "base/head" .}}
+<div class="ui container center">
+	401 Unauthorized
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}

+ 3 - 4
templates/status/403.tmpl

@@ -1,6 +1,5 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div class="container">
+{{template "base/head" .}}
+<div class="ui container center">
 	403 Forbidden
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}

+ 4 - 6
templates/status/404.tmpl

@@ -1,11 +1,9 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div class="container text-center">
+{{template "base/head" .}}
+<div class="ui container center">
     <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/404.png" alt="404"/></p>
-    <hr/>
+    <div class="ui divider"></div>
     <br>
     <p>Application Version: {{AppVer}}</p>
     <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
-    <!-- <p>We're currently working on 0.5 beta version, many pages may be missing at this time. Sorry for confusion!</p> -->
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}

+ 4 - 5
templates/status/500.tmpl

@@ -1,10 +1,9 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="body" class="container text-center">
+{{template "base/head" .}}
+<div class="ui container center">
     <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/500.png" alt="500"/></p>
-    <hr/>
+    <div class="ui divider"></div>
     <br>
     {{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}}
     <p>Application Version: {{AppVer}}</p>
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}

部分文件因文件數量過多而無法顯示