Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/README.md1
-rw-r--r--doc/customization/issue_closing.md5
-rw-r--r--doc/customization/welcome_message.md4
3 files changed, 10 insertions, 0 deletions
diff --git a/doc/README.md b/doc/README.md
index a85f2b6256e..2f90cf14a64 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -19,6 +19,7 @@
- [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
- [Update](update/README.md) Update guides to upgrade your installation.
- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
+- [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages.
## Contributor documentation
diff --git a/doc/customization/issue_closing.md b/doc/customization/issue_closing.md
new file mode 100644
index 00000000000..ddc0c8eac2b
--- /dev/null
+++ b/doc/customization/issue_closing.md
@@ -0,0 +1,5 @@
+# Issue closing pattern
+
+By default you can close issues from commit messages by saying 'Closes #12' or 'Fixed #101'.
+
+If you want to customize the message please do so in [gitlab.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/73b92f85bcd6c213b845cc997843a969cf0906cf/config/gitlab.yml.example#L73)
diff --git a/doc/customization/welcome_message.md b/doc/customization/welcome_message.md
index 6000d389796..6c141d1fb7a 100644
--- a/doc/customization/welcome_message.md
+++ b/doc/customization/welcome_message.md
@@ -1,3 +1,7 @@
+# Customize the complete sign-in page (GitLab Enterprise Edition only)
+
+Please see [Branded login page](http://doc.gitlab.com/ee/customization/branded_login_page.html)
+
# Add a welcome message to the sign-in page (GitLab Community Edition)
It is possible to add a markdown-formatted welcome message to your GitLab