diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-05-29 08:19:07 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-05-29 08:19:07 +0000 |
| commit | 749d198f10fe031d56fda540788148eeaa906bc8 (patch) | |
| tree | 75a7a31e7179e2ff8b85067182dbb3f58902f1c5 | |
| parent | ce498eed9a2f394ce8c3110d0e233e873152c931 (diff) | |
| parent | dfaf1a09924407df3b08d8796bc00ad2a0f56723 (diff) | |
| download | gitlab-ce-749d198f10fe031d56fda540788148eeaa906bc8.tar.gz | |
Merge branch 'deprecate_ruby_1.9.3' into 'master'
Deprecate ruby 1.9.3
Fixes #1106
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/install/requirements.md | 2 | ||||
| -rw-r--r-- | doc/raketasks/maintenance.md | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 163e46975ae..c8a969912e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 7.0.0 - Refactor the markdown relative links processing - Make it easier to implement other CI services for GitLab - Group masters can create projects in group + - Deprecate ruby 1.9.3 support v 6.9.1 - Fix scroll to highlighted line diff --git a/README.md b/README.md index ef0b84c9bd1..10b3c9a8288 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ ### Requirements * Ubuntu/Debian/CentOS/RHEL** -* ruby 1.9.3+ +* ruby 2.0+ * git 1.7.10+ * redis 2.0+ * MySQL or PostgreSQL diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 2830a75df52..3b8335e2725 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -36,7 +36,7 @@ Please consider using a virtual machine to run GitLab. # Ruby versions -GitLab requires Ruby (MRI) 1.9.3 or 2.0+. +GitLab requires Ruby (MRI) 2.0+. You will have to use the standard MRI implementation of Ruby. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions. diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md index da58962499b..e9ae3fb300e 100644 --- a/doc/raketasks/maintenance.md +++ b/doc/raketasks/maintenance.md @@ -16,8 +16,8 @@ System information System: Debian 6.0.7 Current User: git Using RVM: no -Ruby Version: 1.9.3p392 -Gem Version: 1.8.23 +Ruby Version: 2.0.0-p481 +Gem Version: 1.8.23 Bundler Version:1.3.5 Rake Version: 10.0.4 |