#3091 show Git configs on admin panel

conf/locale/locale_en-US.ini

@@ -1008,6 +1008,7 @@ config.db_ssl_mode = SSL Mode
 config.db_ssl_mode_helper = (for "postgres" only)
 config.db_path = Path
 config.db_path_helper = (for "sqlite3" and "tidb")
+
 config.service_config = Service Configuration
 config.register_email_confirm = Require Email Confirmation
 config.disable_register = Disable Registration
@@ -1018,10 +1019,12 @@ config.disable_key_size_check = Disable Minimum Key Size Check
 config.enable_captcha = Enable Captcha
 config.active_code_lives = Active Code Lives
 config.reset_password_code_lives = Reset Password Code Lives
+
 config.webhook_config = Webhook Configuration
 config.queue_length = Queue Length
 config.deliver_timeout = Deliver Timeout
 config.skip_tls_verify = Skip TLS Verify
+
 config.mailer_config = Mailer Configuration
 config.mailer_enabled = Enabled
 config.mailer_disable_helo = Disable HELO
@@ -1031,12 +1034,15 @@ config.mailer_user = User
 config.send_test_mail = Send Test Email
 config.test_mail_failed = Fail to send test email to '%s': %v
 config.test_mail_sent = Test email has been sent to '%s'.
+
 config.oauth_config = OAuth Configuration
 config.oauth_enabled = Enabled
+
 config.cache_config = Cache Configuration
 config.cache_adapter = Cache Adapter
 config.cache_interval = Cache Interval
 config.cache_conn = Cache Connection
+
 config.session_config = Session Configuration
 config.session_provider = Session Provider
 config.provider_config = Provider Config
@@ -1046,10 +1052,24 @@ config.gc_interval_time = GC Interval Time
 config.session_life_time = Session Life Time
 config.https_only = HTTPS Only
 config.cookie_life_time = Cookie Life Time
+
 config.picture_config = Picture Configuration
 config.picture_service = Picture Service
 config.disable_gravatar = Disable Gravatar
 config.enable_federated_avatar = Enable Federated Avatars
+
+config.git_config = Git Configuration
+config.git_disable_diff_highlight = Disable Diff Syntax Highlight
+config.git_max_diff_lines = Max Diff Lines (for a single file)
+config.git_max_diff_line_characters = Max Diff Characters (for a single line)
+config.git_max_diff_files = Max Diff Files (to be shown)
+config.git_gc_args = GC Arguments
+config.git_migrate_timeout = Migration Timeout
+config.git_mirror_timeout = Mirror Update Timeout
+config.git_clone_timeout = Clone Operation Timeout
+config.git_pull_timeout = Pull Operation Timeout
+config.git_gc_timeout = GC Operation Timeout
+
 config.log_config = Log Configuration
 config.log_mode = Log Mode
 

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.71.0808"
+const APP_VER = "0.9.71.0809"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

routers/admin/admin.go

@@ -224,6 +224,8 @@ func Config(ctx *context.Context) {
 	ctx.Data["DisableGravatar"] = setting.DisableGravatar
 	ctx.Data["EnableFederatedAvatar"] = setting.EnableFederatedAvatar
 
+	ctx.Data["Git"] = setting.Git
+
 	type logger struct {
 		Mode, Config string
 	}

templates/.VERSION

@@ -1 +1 @@
-0.9.71.0808
+0.9.71.0809

templates/admin/config.tmpl

@@ -156,7 +156,7 @@
 							<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
 							<dd>{{.Mailer.Host}}</dd>
 							<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
-							<dd>{{.Mailer.User}}</dd><br>
+							<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
 							<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
 								{{.CsrfTokenHtml}}
 								<div class="inline field ui left">
@@ -179,8 +179,10 @@
 						<dd>{{.CacheAdapter}}</dd>
 						<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
 						<dd>{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						{{if .CacheConn}}
 						<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
-						<dd><pre>{{.CacheConn}}</pre></dd>
+						<dd><code>{{.CacheConn}}</code></dd>
+						{{end}}
 					</dl>
 				</div>
 
@@ -192,7 +194,7 @@
 						<dt>{{.i18n.Tr "admin.config.session_provider"}}</dt>
 						<dd>{{.SessionConfig.Provider}}</dd>
 						<dt>{{.i18n.Tr "admin.config.provider_config"}}</dt>
-						<dd><pre>{{.SessionConfig.ProviderConfig}}</pre></dd>
+						<dd><code>{{.SessionConfig.ProviderConfig}}</code></dd>
 						<dt>{{.i18n.Tr "admin.config.cookie_name"}}</dt>
 						<dd>{{.SessionConfig.CookieName}}</dd>
 						<dt>{{.i18n.Tr "admin.config.gc_interval_time"}}</dt>
@@ -213,12 +215,40 @@
 					<dl class="dl-horizontal admin-dl-horizontal">
 						<dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt>
 						<dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd>
+						<div class="ui divider"></div>
+						<dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt>
+						<dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
 					</dl>
 				</div>
+
+				<h4 class="ui top attached header">
+					{{.i18n.Tr "admin.config.git_config"}}
+				</h4>
 				<div class="ui attached table segment">
 					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt>
-						<dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
+						<dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt>
+						<dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
+						<dd>{{.Git.MaxGitDiffLines}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}</dt>
+						<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_files"}}</dt>
+						<dd>{{.Git.MaxGitDiffFiles}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_gc_args"}}</dt>
+						<dd><code>{{.Git.GCArgs}}</code></dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
+						<dd>{{.Git.MaxGitDiffLines}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.i18n.Tr "admin.config.git_migrate_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_mirror_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_clone_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_pull_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_gc_timeout"}}</dt>
+						<dd>{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
 					</dl>
 				</div>
 
@@ -231,7 +261,7 @@
 							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 							<dd>{{.Mode}}</dd>
 							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
-							<dd><pre>{{.Config}}</pre></dd>
+							<dd><code>{{.Config}}</code></dd>
 						{{end}}
 					</dl>
 				</div>