diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-11 18:06:03 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-11 18:06:03 +0000 |
commit | cbafc9ef301dbdc3c3205541cd0f8e31e28ece7a (patch) | |
tree | f9ef5f9df2e4a7c539ad2380a653e05f4ed4a35e /doc | |
parent | 55d0442e9c1b150928abef6842fb630f856c145d (diff) | |
parent | 3b973d1898eeb660f85d70affdf0e933328f985d (diff) | |
download | gitlab-ce-cbafc9ef301dbdc3c3205541cd0f8e31e28ece7a.tar.gz |
Merge branch 'ruby-2-3-lets-not-break-things' into 'master'
Use Ruby 2.3.1
## What does this MR do?
This WIP MR will eventually introduce 2.3 as default language for GitLab CE/EE
## Why was this MR needed?
@connorshea wants to be prepared for Rails 5.0, so we need Ruby > 2.2, so why not go 2.3 already?
## What are the relevant issue numbers?
Closes #12507
## TODO
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
- [ ] [Omnibus uses 2.3.1](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/847)
See merge request !4948
Diffstat (limited to 'doc')
-rw-r--r-- | doc/install/installation.md | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index c044d0880d3..eb9606934cd 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 versions are 2.1.x and 2.3.x. 2.3.x is preferred, and support for 2.1.x will be dropped in the future. 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 |