summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-06 17:03:31 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-11-06 17:03:31 -0600
commita46d32412ec93be2d6d10bd4bcbdd23b69d31865 (patch)
treeb017b0a0ff5628c11a42cf5c853414b46d77be10 /doc
parentcb7d63f90753617920cc6f9168a48dc998dc9ee4 (diff)
parent243530360edac31f309bd3706b2d5117f6d526ad (diff)
downloadgitlab-ce-a46d32412ec93be2d6d10bd4bcbdd23b69d31865.tar.gz
Merge branch 'master' into 38464-k8s-apps
Conflicts: db/schema.rb
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/logs.md9
-rw-r--r--doc/development/ux_guide/resources.md6
2 files changed, 14 insertions, 1 deletions
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index c9ed2d84ccb..debaa2330d0 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -192,4 +192,13 @@ installations from source.
It logs information whenever a [repository check is run][repocheck] on a project.
+## Reconfigure Logs
+
+Reconfigure log files live in `/var/log/gitlab/reconfigure` for Omnibus GitLab
+packages. Installations from source don't have reconfigure logs. A reconfigure log
+is populated whenever `gitlab-ctl reconfigure` is run manually or as part of an upgrade.
+
+Reconfigure logs files are named according to the UNIX timestamp of when the reconfigure
+was initiated, such as `1509705644.log`
+
[repocheck]: repository_checks.md
diff --git a/doc/development/ux_guide/resources.md b/doc/development/ux_guide/resources.md
index 2f760c94414..db57258237f 100644
--- a/doc/development/ux_guide/resources.md
+++ b/doc/development/ux_guide/resources.md
@@ -10,4 +10,8 @@ you can use during GitLab development.
## Design repository
All design files are stored in the [gitlab-design](https://gitlab.com/gitlab-org/gitlab-design)
-repository and maintained by GitLab UX designers. \ No newline at end of file
+repository and maintained by GitLab UX designers.
+
+## [brand.ai](https://brand.ai/git-lab/primary-brand)
+
+We are in the process of capturing our UI paradigms on brand.ai, see https://brand.ai/git-lab/primary-brand