Skip to content

Commit

Permalink
Remove support for Ruby 2.6 (#21477)
Browse files Browse the repository at this point in the history
As pointed out by #21297 (comment)
at least one of our dependencies already dropped support for Ruby 2.6, and we
had removed Ruby 2.6 tests from the CI over a year ago (#16861).

So stop advertising Ruby 2.6 support, bump targeted version, and drop some
compatibility code.
  • Loading branch information
ClearlyClaire committed Nov 27, 2022
1 parent 47f0d70 commit 098ced7
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Expand Up @@ -2,7 +2,7 @@ require:
- rubocop-rails

AllCops:
TargetRubyVersion: 2.5
TargetRubyVersion: 2.7
NewCops: disable
Exclude:
- 'spec/**/*'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '>= 2.6.0', '< 3.1.0'
ruby '>= 2.7.0', '< 3.1.0'

gem 'pkg-config', '~> 1.4'
gem 'rexml', '~> 3.2'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -72,7 +72,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre

- **PostgreSQL** 9.5+
- **Redis** 4+
- **Ruby** 2.6+
- **Ruby** 2.7+
- **Node.js** 14+

The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
Expand Down
1 change: 0 additions & 1 deletion config/application.rb
Expand Up @@ -22,7 +22,6 @@
Bundler.require(*Rails.groups)

require_relative '../lib/exceptions'
require_relative '../lib/enumerable'
require_relative '../lib/sanitize_ext/sanitize_config'
require_relative '../lib/redis/namespace_extensions'
require_relative '../lib/paperclip/url_generator_extensions'
Expand Down
26 changes: 0 additions & 26 deletions lib/enumerable.rb

This file was deleted.

0 comments on commit 098ced7

Please sign in to comment.