remove system manager tag

Author: a1012112796

custom/conf/app.example.ini

@@ -207,8 +207,6 @@ DEFAULT_SHOW_FULL_NAME = false
 SEARCH_REPO_DESCRIPTION = true
 ; Whether to enable a Service Worker to cache frontend assets
 USE_SERVICE_WORKER = true
-; show `system administrator` tag on comment header
-SHOW_SYS_ADMIN_COMMENT_TAG = false
 
 [ui.admin]
 ; Number of users that are displayed on one page

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -172,7 +172,6 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
 - `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.
-- `SHOW_SYS_ADMIN_COMMENT_TAG`: **false**: show `system administrator` tag on comment header
 
 ### UI - Admin (`ui.admin`)
 

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -40,7 +40,6 @@ menu:
 - `ISSUE_PAGING_NUM`: 工单页面每页显示的工单数量。
 - `MEMBERS_PAGING_NUM`: **20**: 组织成员页面每页显示的成员数量。
 - `FEED_MAX_COMMIT_NUM`: 活动流页面显示的最大提交数量。
-- `SHOW_SYS_ADMIN_COMMENT_TAG`: **false**: 在系统管理员的评论上显示 `系统管理员` 标志
 
 ### UI - Admin (`ui.admin`)
 

models/issue_comment.go

@@ -111,7 +111,6 @@ const (
 	CommentTagPoster
 	CommentTagWriter
 	CommentTagOwner
-	CommentTagSysAdmin
 )
 
 // Comment represents a comment in commit and issue page.

modules/setting/setting.go

@@ -160,26 +160,25 @@ var (
 
 	// UI settings
 	UI = struct {
-		ExplorePagingNum       int
-		IssuePagingNum         int
-		RepoSearchPagingNum    int
-		MembersPagingNum       int
-		FeedMaxCommitNum       int
-		FeedPagingNum          int
-		GraphMaxCommitNum      int
-		CodeCommentLines       int
-		ReactionMaxUserNum     int
-		ThemeColorMetaTag      string
-		MaxDisplayFileSize     int64
-		ShowUserEmail          bool
-		DefaultShowFullName    bool
-		DefaultTheme           string
-		Themes                 []string
-		Reactions              []string
-		ReactionsMap           map[string]bool
-		SearchRepoDescription  bool
-		UseServiceWorker       bool
-		ShowSysAdminCommentTag bool
+		ExplorePagingNum      int
+		IssuePagingNum        int
+		RepoSearchPagingNum   int
+		MembersPagingNum      int
+		FeedMaxCommitNum      int
+		FeedPagingNum         int
+		GraphMaxCommitNum     int
+		CodeCommentLines      int
+		ReactionMaxUserNum    int
+		ThemeColorMetaTag     string
+		MaxDisplayFileSize    int64
+		ShowUserEmail         bool
+		DefaultShowFullName   bool
+		DefaultTheme          string
+		Themes                []string
+		Reactions             []string
+		ReactionsMap          map[string]bool
+		SearchRepoDescription bool
+		UseServiceWorker      bool
 
 		Notification struct {
 			MinTimeout            time.Duration
@@ -908,7 +907,6 @@ func NewContext() {
 	UI.DefaultShowFullName = Cfg.Section("ui").Key("DEFAULT_SHOW_FULL_NAME").MustBool(false)
 	UI.SearchRepoDescription = Cfg.Section("ui").Key("SEARCH_REPO_DESCRIPTION").MustBool(true)
 	UI.UseServiceWorker = Cfg.Section("ui").Key("USE_SERVICE_WORKER").MustBool(true)
-	UI.ShowSysAdminCommentTag = Cfg.Section("ui").Key("SHOW_SYS_ADMIN_COMMENT_TAG").MustBool(false)
 
 	HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt"))
 

options/locale/locale_en-US.ini

@@ -1075,7 +1075,6 @@ issues.ref_from = `from %[1]s`
 issues.poster = Poster
 issues.collaborator = Collaborator
 issues.owner = Owner
-issues.sys_admin = system administrator
 issues.re_request_review=Re-request review
 issues.is_stale = There have been changes to this PR since this review
 issues.remove_request_review=Remove review request

routers/repo/issue.go

@@ -993,10 +993,6 @@ func commentTag(repo *models.Repository, poster *models.User, issue *models.Issu
 			return models.CommentTagOwner, nil
 		}
 
-		if setting.UI.ShowSysAdminCommentTag && poster.IsAdmin {
-			return models.CommentTagSysAdmin, nil
-		}
-
 		if ok, err = repo.IsCollaborator(poster.ID); ok && err == nil {
 			return models.CommentTagWriter, nil
 		}

templates/repo/issue/view_content.tmpl

@@ -48,8 +48,6 @@
 											{{$.i18n.Tr "repo.issues.collaborator"}}
 										{{else if eq .Issue.ShowTag 3}}
 											{{$.i18n.Tr "repo.issues.owner"}}
-										{{else if eq .Issue.ShowTag 4}}
-											{{$.i18n.Tr "repo.issues.sys_admin"}}
 										{{end}}
 									</div>
 								{{end}}

templates/repo/issue/view_content/comments.tmpl

@@ -54,8 +54,6 @@
 										{{$.i18n.Tr "repo.issues.collaborator"}}
 									{{else if eq .ShowTag 3}}
 										{{$.i18n.Tr "repo.issues.owner"}}
-									{{else if eq .ShowTag 4}}
-										{{$.i18n.Tr "repo.issues.sys_admin"}}
 									{{end}}
 								</div>
 							{{end}}