diff options
author | Marin Jankovski <marin@gitlab.com> | 2019-02-07 15:56:01 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2019-02-07 15:56:01 +0300 |
commit | 294129475c0977ce8bd32a6fa43b62af5022ee67 (patch) | |
tree | b7c95d8d93a0daba2c20b7bea15ad6aef449f6ff | |
parent | 3c64ad4c85366d2c82d178012f737043ce172334 (diff) | |
parent | fd838d805d8ddb0803286ac99265a9411a087ed7 (diff) |
Merge branch 'docs/source-installation-requirements' into 'master'
Update source installation to make it easier for release managers to work on releases
Closes gitlab-org/release/framework#113
See merge request gitlab-org/gitlab-ce!24967
-rw-r--r-- | doc/development/contributing/merge_request_workflow.md | 3 | ||||
-rw-r--r-- | doc/install/installation.md | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 9bef0635e3f..19b6181c9a2 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -86,6 +86,9 @@ request is as follows: guidelines](../merge_request_performance_guidelines.md). 1. For tests that use Capybara or PhantomJS, see this [article on how to write reliable asynchronous tests](https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara). +1. If your merge request introduces changes that require additional steps when + installing GitLab from source, add them to `doc/install/installation.md` in + the same merge request. Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. diff --git a/doc/install/installation.md b/doc/install/installation.md index e36bc6e889a..a8064ae046e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -345,11 +345,15 @@ cd /home/git ```sh # Clone GitLab repository -sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 11-7-stable gitlab +sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b X-Y-stable gitlab ``` +Make sure to replace `X-Y-stable` with the stable branch that matches the +version you want to install. For example, if you want to install 11.8 you would +use the branch name `11-8-stable`. + CAUTION: **Caution:** -You can change `11-7-stable` to `master` if you want the *bleeding edge* version, but never install `master` on a production server! +You can change `X-Y-stable` to `master` if you want the *bleeding edge* version, but never install `master` on a production server! ### Configure It |