summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-27 09:34:17 -0600
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-08-11 19:00:00 +0200
commit39103b1437b65b9e516649153d16c31226396989 (patch)
tree11b89c7e4a7b39a1fc9c0c93f6ddd417c84b16be
parent790dd898692e58a05fdac7192ea50048dcceee79 (diff)
downloadgitlab-ce-39103b1437b65b9e516649153d16c31226396989.tar.gz
Update docs to reference Ruby 2.3.1
-rw-r--r--doc/install/installation.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index c044d0880d3..118d1fc3966 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -108,8 +108,7 @@ Then select 'Internet Site' and press enter to confirm the hostname.
## 2. Ruby
-_**Note:** The current supported Ruby version is 2.1.x. Ruby 2.2 and 2.3 are
-currently not supported._
+_**Note:** The current supported Ruby version is 2.3.x.
The use of Ruby version managers such as [RVM], [rbenv] or [chruby] with GitLab
in production, frequently leads to hard to diagnose problems. For example,
@@ -124,9 +123,9 @@ Remove the old Ruby 1.8 if present:
Download Ruby and compile it:
mkdir /tmp/ruby && cd /tmp/ruby
- curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz
- echo 'c7e50159357afd87b13dc5eaf4ac486a70011149 ruby-2.1.8.tar.gz' | shasum -c - && tar xzf ruby-2.1.8.tar.gz
- cd ruby-2.1.8
+ curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz
+ echo 'c39b4001f7acb4e334cb60a0f4df72d434bef711 ruby-2.3.1.tar.gz' | shasum -c - && tar xzf ruby-2.3.1.tar.gz
+ cd ruby-2.3.1
./configure --disable-install-rdoc
make
sudo make install
@@ -591,13 +590,13 @@ for the changes to take effect.
If you'd like to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file.
# example
- production:
+ production:
url: redis://redis.example.tld:6379
If you want to connect the Redis server via socket, then use the "unix:" URL scheme and the path to the Redis socket file in the `config/resque.yml` file.
# example
- production:
+ production:
url: unix:/path/to/redis/socket
### Custom SSH Connection