From 201b5904231afd41ed8ea2260993998f22aa1bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 29 Aug 2014 22:56:47 +0200 Subject: [PATCH] drop Ruby 1.9 support, recommend Ruby 2.1 --- .ruby-version | 2 +- .travis.yml | 4 ++-- Changelog.md | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index cd5ac039d..879b416e6 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.0 +2.1 diff --git a/.travis.yml b/.travis.yml index 5a36ee594..e44cf2707 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ branches: language: ruby rvm: - - 2.0.0 - - 1.9.3 + - 2.1 + - 2.0 env: - DB=postgres BUILD_TYPE=other diff --git a/Changelog.md b/Changelog.md index cd218f19b..e05bd710e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -14,6 +14,13 @@ Diaspora::Application.config.secret_key_base = '*************...' You also need to take care to set `RAILS_ENV` while precompiling assets: `RAILS_ENV=production bundle exec rake assets:precompile` +## Supported Ruby versions +This release drops official support for the Ruby 1.9 series. This means we will no longer test against this Ruby version or take care to choose libraries +that work with it. However that doesn't mean we won't accept patches that improve running diaspora* on it. + +At the same time we adopt support for the Ruby 2.1 series and recommend running on the latest Ruby version of that branch. We continue to support the Ruby 2.0 +series and run our comphrensive testsuite against it. + ## Change in defaults.yml The default for including jQuery from a CDN has changed. If you want to continue to include it from a CDN, please explicitly set the `jquery_cdn` setting to `true` in diaspora.yml.