Commit 749d198f authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'deprecate_ruby_1.9.3' into 'master'

Deprecate ruby 1.9.3

Fixes #1106
parents ce498eed dfaf1a09
...@@ -11,6 +11,7 @@ v 7.0.0 ...@@ -11,6 +11,7 @@ v 7.0.0
- Refactor the markdown relative links processing - Refactor the markdown relative links processing
- Make it easier to implement other CI services for GitLab - Make it easier to implement other CI services for GitLab
- Group masters can create projects in group - Group masters can create projects in group
- Deprecate ruby 1.9.3 support
v 6.9.1 v 6.9.1
- Fix scroll to highlighted line - Fix scroll to highlighted line
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
### Requirements ### Requirements
* Ubuntu/Debian/CentOS/RHEL** * Ubuntu/Debian/CentOS/RHEL**
* ruby 1.9.3+ * ruby 2.0+
* git 1.7.10+ * git 1.7.10+
* redis 2.0+ * redis 2.0+
* MySQL or PostgreSQL * MySQL or PostgreSQL
......
...@@ -36,7 +36,7 @@ Please consider using a virtual machine to run GitLab. ...@@ -36,7 +36,7 @@ Please consider using a virtual machine to run GitLab.
# Ruby versions # 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. 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. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.
......
...@@ -16,8 +16,8 @@ System information ...@@ -16,8 +16,8 @@ System information
System: Debian 6.0.7 System: Debian 6.0.7
Current User: git Current User: git
Using RVM: no Using RVM: no
Ruby Version: 1.9.3p392 Ruby Version: 2.0.0-p481
Gem Version: 1.8.23 Gem Version: 1.8.23
Bundler Version:1.3.5 Bundler Version:1.3.5
Rake Version: 10.0.4 Rake Version: 10.0.4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment