Merge "Don't ignore .txt file extension"
diff --git a/Documentation/config.md b/Documentation/config.md
index dc7977d..9f41e45 100644
--- a/Documentation/config.md
+++ b/Documentation/config.md
@@ -7,6 +7,74 @@
## Core configuration
+### Site Title
+
+The title of the site. Default: `Gitiles`.
+
+```
+[gitiles]
+ siteTitle = Acme Inc. Git Browser
+```
+
+### URLs
+
+`canonicalHostName`.
+Default: `null`, determine the hostname from the local host.
+
+`baseGitUrl` the base URL for git repositories.
+
+`gerritUrl`, URL prefix to linkify Gerrit `Change-Id` headers in commit
+messages. If you are using the Gerrit Gitiles plugin, this is set based on
+Gerrit's configuration.
+Default: `null`, do not link `Change-Id`.
+
+```
+[gitiles]
+ canonicalHostName = gitiles.example.org
+ gerritUrl = https://gerrit.example.org/r/
+ baseGitUrl = git://git.example.org/
+```
+
+### Repositories export
+
+Set `exportAll` to instruct jGit to export all repositories, ignoring the check
+for existence of `git-daemon-export-ok` file at the root of the repository.
+
+Default: `false`, repositories need to be explicitly marked for export.
+
+```
+[gitiles]
+exportAll = true
+```
+
+### Custom templating
+
+The web views are defined via Soy templates, you inject your own version which
+will be passed to the renderer. See `.soy` files in the source code for
+available templates
+
+```
+[gitiles]
+customTemplates = path/to/somefile.soy
+customTemplates = path/to/another.soy
+```
+
+### Fixed time zone
+
+By default dates are formatted including the local user time zone as that
+matches git tools. Some users/administrators may prefer normalizing to a
+particular timezone so times are directly comparable without doing timezone
+arithmetic.
+
+Setting `fixedTimeZone` to a valid Java TimeZone ID causes all dates in the UI
+to be implicitly converted to this timezone, and the now-redundant timezone
+offset to be dropped from the output.
+
+```
+[gitiles]
+ fixedTimeZone = UTC
+```
+
### Cross-Origin Resource Sharing (CORS)
Gitiles sets the `Access-Control-Allow-Origin` header to the
@@ -20,6 +88,17 @@
By default `allowOriginRegex` is unset, denying all cross-origin requests.
+### Gitweb redirector
+
+Redirect requests to old gitweb URLs after having migrated to Gitiles. Matching
+URLs will be redirected permanently to their Gitiles equivalent.
+Default: `true`.
+
+```
+[gitiles]
+redirectGitweb = false
+```
+
## Markdown
### Disabling markdown
diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 82fedb0..6f809fd 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -21,6 +21,12 @@
$ go install github.com/bazelbuild/bazelisk@latest
$ export PATH=$PATH:$(go env GOPATH)/bin
```
+
+Make sure to initialize and update the git submodules:
+```
+git submodule update --init
+```
+
You are now ready to build and test.
```
@@ -36,11 +42,12 @@
Error in execute: Argument 0 of execute is neither a path, label, nor string.
```
-Make sure you are using python2. For debian users, the command
-is:
+Make sure you have `python` available in your PATH. Since Debian 11 and Ubuntu
+20.04 LTS (focal), there is no `/usr/bin/python` provided by default. You can
+install a package to provide a link to Python 3:
```
-sudo apt-get install python-is-python2
+sudo apt-get install python-is-python3
```
Upon uploading your new CL, if you encounter a message related to a
diff --git a/WORKSPACE b/WORKSPACE
index 95c5559..d0e9e4e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,7 +12,7 @@
load("//tools:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f30a992da9fc855dce819875afb59f9dd6f860cd",
+ commit = "e68cc7a45d9ee2b100024b9b12533b50a4598585",
# local_path = "/home/<user>/projects/bazlets",
)
