diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2016-12-22 19:12:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 19:12:23 +0100 |
| commit | b33078fa33441c33c5d018b1b9a248c646549842 (patch) | |
| tree | 0f890f88987764c1409c6c9d90edd8e727f3219e /modules/base | |
| parent | c21e2c4151b5bc13e54de902f59e7b4c46b47540 (diff) | |
| download | gitea-b33078fa33441c33c5d018b1b9a248c646549842.tar.gz gitea-b33078fa33441c33c5d018b1b9a248c646549842.zip | |
Bindata is optional and over-writable on restart (#354)
* Moved conf assets into options folder
* Dropped old bindata
* Started to integrate options bindata and accessors
* Do not enforce a builtin app.ini
* Replaced bindata calls with options
* Dropped bindata task from makefile, it's the generate task now
* Always embedd app.ini to provide sane config defaults
* Use sane defaults for the configuration
* Defined default value for SSH_KEYGEN_PATH
* Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini
* Fixed new paths in latest test additions
* Drop bindata with make clean task
* Set more proper default values
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/tool_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 9c4fb89e8e..bda2e65a19 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -25,7 +25,7 @@ const ( func TestMain(m *testing.M) { // setup macaroni18n.I18n(macaroni18n.Options{ - Directory: "../../conf/locale/", + Directory: "../../options/locale/", DefaultLang: "en-US", Langs: []string{"en-US"}, Names: []string{"english"}, |