From 9d756f3d8be74103fff0c119e2e1e0701ec93d54 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Wed, 20 Jan 2016 10:33:59 +0100 Subject: Add document on restarting GitLab [ci skip] --- doc/development/doc_styleguide.md | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc/development') diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md index 0bd32b78201..0539bc2df21 100644 --- a/doc/development/doc_styleguide.md +++ b/doc/development/doc_styleguide.md @@ -103,6 +103,17 @@ Inside the document: `_**Note:** This feature was introduced in GitLab EE 8.3_`. Otherwise, leave this mention out +## References + +- There are many cases that a restart/reconfigure of GitLab is required. To + avoid duplication, link to the special document that can be found in + `doc/administration/restart_gitlab.md`. Usually the text will read like: + + ``` + Save the file and [reconfigure GitLab](../administration/restart_gitlab.md) for the changes to take effect. + ``` + Replace `reconfigure` with `restart` where appropriate. + ## API Here is a list of must-have items. Use them in the exact order that appears -- cgit v1.2.1 From 086cbca6bf9d6fdad862a19b7fe468a315b05803 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Wed, 20 Jan 2016 10:44:26 +0100 Subject: Link to restart_gitlab.md and some more fixes [ci skip] --- doc/development/doc_styleguide.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'doc/development') diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md index 0539bc2df21..caaa4032db2 100644 --- a/doc/development/doc_styleguide.md +++ b/doc/development/doc_styleguide.md @@ -105,13 +105,19 @@ Inside the document: ## References -- There are many cases that a restart/reconfigure of GitLab is required. To +- **GitLab Restart:** + There are many cases that a restart/reconfigure of GitLab is required. To avoid duplication, link to the special document that can be found in - `doc/administration/restart_gitlab.md`. Usually the text will read like: + [`doc/administration/restart_gitlab.md`][doc-restart]. Usually the text will + read like: ``` - Save the file and [reconfigure GitLab](../administration/restart_gitlab.md) for the changes to take effect. + Save the file and [reconfigure GitLab](../administration/restart_gitlab.md) + for the changes to take effect. ``` + If the document you are editing resides in a place other than the GitLab CE/EE + `doc/` directory, instead of the relative link, use the full path: + `http://doc.gitlab.com/ce/administration/restart_gitlab.html`. Replace `reconfigure` with `restart` where appropriate. ## API @@ -240,3 +246,4 @@ curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -d "restricted_signup_domai [cURL]: http://curl.haxx.se/ "cURL website" [single spaces]: http://www.slate.com/articles/technology/technology/2011/01/space_invaders.html [gfm]: http://doc.gitlab.com/ce/markdown/markdown.html#newlines "GitLab flavored markdown documentation" +[doc-restart]: ../administration/restart_gitlab.md "GitLab restart documentation" -- cgit v1.2.1 From 1c51fb1778e5e14f245f9e8d8a3531a4effc811f Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 21 Jan 2016 16:12:49 +0100 Subject: update Ruby version to 2.2.4 (latest previous stable) and update docs --- doc/development/ci_setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/development') diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md index f9b48868182..05db30b4a7e 100644 --- a/doc/development/ci_setup.md +++ b/doc/development/ci_setup.md @@ -26,7 +26,7 @@ We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master # Build configuration on [Semaphore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for testing the [GitHub.com repo](https://github.com/gitlabhq/gitlabhq) - Language: Ruby -- Ruby version: 2.1.2 +- Ruby version: 2.2.4 - database.yml: pg Build commands -- cgit v1.2.1