From 62945b75197f468d5a5bcaf0080e4cb7c8decad9 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Sat, 12 Dec 2020 11:35:04 +0800 Subject: [PATCH] Bumping version to 6.1.1 --- CHANGELOG.md | 5 +++++ Gemfile.rails-6.0 | 2 +- Gemfile.rails-6.1 | 15 +++++++++++++++ lib/bullet/version.rb | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Gemfile.rails-6.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cee5b0d..bc0f9908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Next Release +## 6.1.1 (12/12/2020) + +* Add support Rails 6.1 +* Make whitelist thread safe + ## 6.1.0 (12/28/2019) * Add skip_html_injection flag diff --git a/Gemfile.rails-6.0 b/Gemfile.rails-6.0 index 8b3df2bb..428b948f 100644 --- a/Gemfile.rails-6.0 +++ b/Gemfile.rails-6.0 @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem 'rails', '6.0.0' +gem 'rails', '~> 6.0.0' gem 'sqlite3' gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby] gem 'activerecord-import' diff --git a/Gemfile.rails-6.1 b/Gemfile.rails-6.1 new file mode 100644 index 00000000..9f231dbc --- /dev/null +++ b/Gemfile.rails-6.1 @@ -0,0 +1,15 @@ +source "https://rubygems.org" + +gemspec + +gem 'rails', '~> 6.1.0' +gem 'sqlite3' +gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby] +gem 'activerecord-import' + +gem "rspec" + +platforms :rbx do + gem 'rubysl', '~> 2.0' + gem 'rubinius-developer_tools' +end diff --git a/lib/bullet/version.rb b/lib/bullet/version.rb index 2b78a94f..8da7dd29 100644 --- a/lib/bullet/version.rb +++ b/lib/bullet/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Bullet - VERSION = '6.1.0' + VERSION = '6.1.1' end