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

Fix for #828: Embed build tags #1051

Merged
merged 5 commits into from
Feb 28, 2017
Merged

Fix for #828: Embed build tags #1051

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dafa5a4
Fix for #828
cez81 Feb 25, 2017
c6737ac
Reworked formatBuiltWith function
cez81 Feb 25, 2017
2f81c12
Add tags to version information in admin panel
cez81 Feb 27, 2017
a0cb2c0
Added new variable for use on admin page.
cez81 Feb 27, 2017
9a928c3
Fixed incorrect indentation
cez81 Feb 27, 2017
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
3 changes: 2 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ var Version = "1.1.0+dev"
var Tags = ""

func init() {
setting.AppVer = Version + formatBuiltWith(Tags)
setting.AppVer = Version
setting.AppBuiltWith = formatBuiltWith(Tags)
}

func main() {
Expand Down
3 changes: 2 additions & 1 deletion modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const (
var (
// AppVer settings
AppVer string
AppBuiltWith string
AppName string
AppURL string
AppSubURL string
Expand Down Expand Up @@ -939,7 +940,7 @@ var logLevels = map[string]string{
}

func newLogService() {
log.Info("Gitea v%s", AppVer)
log.Info("Gitea v%s%s", AppVer, AppBuiltWith)

LogModes = strings.Split(Cfg.Section("log").Key("MODE").MustString("console"), ",")
LogConfigs = make([]string, len(LogModes))
Expand Down
3 changes: 3 additions & 0 deletions modules/templates/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ func NewFuncMap() []template.FuncMap {
"AppVer": func() string {
return setting.AppVer
},
"AppBuiltWith": func() string {
return setting.AppBuiltWith
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

coding style.

"AppDomain": func() string {
return setting.Domain
},
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/config.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dt>{{.i18n.Tr "admin.config.app_name"}}</dt>
<dd>{{AppName}}</dd>
<dt>{{.i18n.Tr "admin.config.app_ver"}}</dt>
<dd>{{AppVer}}</dd>
<dd>{{AppVer}}{{AppBuiltWith}}</dd>
<dt>{{.i18n.Tr "admin.config.app_url"}}</dt>
<dd>{{.AppUrl}}</dd>
<dt>{{.i18n.Tr "admin.config.domain"}}</dt>
Expand Down