diff --git a/.ruby-version b/.ruby-version index bb576dbde..6b4950e3d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3 +2.4 diff --git a/.travis.yml b/.travis.yml index db4fad306..bbc17822c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: + - 2.4.1 - 2.3.4 - - 2.1.10 env: - DB=postgresql BUILD_TYPE=cucumber @@ -29,7 +29,7 @@ before_install: - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH -bundler_args: "--deployment --without development production --with mysql postgresql --jobs 3 --retry 3" +bundler_args: "--deployment --without development --with mysql postgresql --jobs 3 --retry 3" script: "./script/ci/build.sh" diff --git a/Changelog.md b/Changelog.md index c67932a00..c4ac236a4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # 0.7.0.0 +## Supported Ruby versions + +This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version. +Ruby 2.1 is no longer officially supported. + ## Refactor * Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305) @@ -11,6 +16,7 @@ * Remove deprecated statistics.json [#7399](https://github.com/diaspora/diaspora/pull/7399) * Always link comment count text on mobile [#7483](https://github.com/diaspora/diaspora/pull/7483) * Switch to new federation protocol [#7436](https://github.com/diaspora/diaspora/pull/7436) +* Send public profiles publicly [#7501](https://github.com/diaspora/diaspora/pull/7501) ## Bug fixes