diff options
author | James Lopez <james@jameslopez.es> | 2016-02-19 15:59:46 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-02-19 15:59:46 +0100 |
commit | 83829c0902e688882413ab4064d8ff5d3ec54b79 (patch) | |
tree | dc05aaa07bd7de67fab3a5be6c6cb767083d1cb4 /doc | |
parent | 1817b766b2bdf03e886118bda5e1aee48b5c2413 (diff) | |
download | gitlab-ce-83829c0902e688882413ab4064d8ff5d3ec54b79.tar.gz |
revert back to ruby 2.1
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
-rw-r--r-- | doc/development/ci_setup.md | 2 | ||||
-rw-r--r-- | doc/install/installation.md | 8 | ||||
-rw-r--r-- | doc/install/requirements.md | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 461a545c474..0edb56dc20e 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -33,7 +33,7 @@ The YAML syntax allows for using more complex job specifications than in the above example: ```yaml -image: ruby:2.2 +image: ruby:2.1 services: - postgres diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md index 05db30b4a7e..70f02bf08e0 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.2.4 +- Ruby version: 2.1.7 - database.yml: pg Build commands diff --git a/doc/install/installation.md b/doc/install/installation.md index 7f16e6ff5c4..12334c90830 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -107,7 +107,7 @@ Then select 'Internet Site' and press enter to confirm the hostname. ## 2. Ruby -_**Note:** The current supported Ruby versions are 2.1.x and 2.2.x. Ruby 2.3 is +_**Note:** The current supported Ruby version is 2.1.x. Ruby 2.2 and 2.3 are currently not supported._ The use of Ruby version managers such as [RVM], [rbenv] or [chruby] with GitLab @@ -123,9 +123,9 @@ Remove the old Ruby 1.8 if present: Download Ruby and compile it: mkdir /tmp/ruby && cd /tmp/ruby - curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.4.tar.gz - echo 'b6eff568b48e0fda76e5a36333175df049b204e91217aa32a65153cc0cdcb761 ruby-2.2.4.tar.gz' | sha256sum -c - && tar xzf ruby-2.2.4.tar.gz - cd ruby-2.2.4 + curl -O --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.7.tar.gz + echo 'e2e195a4a58133e3ad33b955c829bb536fa3c075 ruby-2.1.7.tar.gz' | shasum -c - && tar xzf ruby-2.1.7.tar.gz + cd ruby-2.1.7 ./configure --disable-install-rdoc make sudo make install diff --git a/doc/install/requirements.md b/doc/install/requirements.md index c6a1c20d02f..3cab677fdc7 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -32,7 +32,7 @@ Please consider using a virtual machine to run GitLab. ## Ruby versions -GitLab requires Ruby (MRI) 2.1.x or 2.2.x and currently does not work with version 2.3. +GitLab requires Ruby (MRI) 2.1.x and currently does not work with versions 2.2 or 2.3. You will have to use the standard MRI implementation of Ruby. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab |