Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show lfs config on admin panel #7220

Merged
merged 1 commit into from
Jun 16, 2019
Merged

Show lfs config on admin panel #7220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,6 +1722,11 @@ config.ssh_keygen_path = Keygen ('ssh-keygen') Path
config.ssh_minimum_key_size_check = Minimum Key Size Check
config.ssh_minimum_key_sizes = Minimum Key Sizes

config.lfs_config = LFS Configuration
config.lfs_enabled = Enabled
config.lfs_content_path = LFS Content Path
config.lfs_http_auth_expiry = LFS HTTP Auth Expiry

config.db_config = Database Configuration
config.db_type = Type
config.db_host = Host
Expand Down
1 change: 1 addition & 0 deletions routers/admin/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ func Config(ctx *context.Context) {
ctx.Data["ReverseProxyAuthEmail"] = setting.ReverseProxyAuthEmail

ctx.Data["SSH"] = setting.SSH
ctx.Data["LFS"] = setting.LFS

ctx.Data["Service"] = setting.Service
ctx.Data["DbCfg"] = models.DbCfg
Expand Down
16 changes: 16 additions & 0 deletions templates/admin/config.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@
</dl>
</div>

<h4 class="ui top attached header">
{{.i18n.Tr "admin.config.lfs_config"}}
</h4>
<div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal">
<dt>{{.i18n.Tr "admin.config.lfs_enabled"}}</dt>
<dd><i class="fa fa{{if .LFS.StartServer}}-check{{end}}-square-o"></i></dd>
{{if .LFS.StartServer}}
<dt>{{.i18n.Tr "admin.config.lfs_content_path"}}</dt>
<dd>{{.LFS.ContentPath}}</dd>
<dt>{{.i18n.Tr "admin.config.lfs_http_auth_expiry"}}</dt>
<dd>{{.LFS.HTTPAuthExpiry}}</dd>
{{end}}
</dl>
</div>

<h4 class="ui top attached header">
{{.i18n.Tr "admin.config.db_config"}}
</h4>
Expand Down