From 45016829d6fce6db42c900a5f7565cd670fd9cc9 Mon Sep 17 00:00:00 2001 From: Leonardo Tegon Date: Thu, 7 Feb 2019 10:46:41 -0200 Subject: [PATCH] Prepare for `4.6.0` release It was necessary to manually set the `sqlite3` Gem version after the release of version `1.4.0`. See https://github.com/rails/rails/issues/35153 for more info. --- CHANGELOG.md | 2 ++ Gemfile | 2 +- Gemfile.lock | 4 ++-- gemfiles/Gemfile.rails-4.1-stable | 2 +- gemfiles/Gemfile.rails-4.1-stable.lock | 6 +++--- gemfiles/Gemfile.rails-4.2-stable | 2 +- gemfiles/Gemfile.rails-4.2-stable.lock | 17 +++++++++-------- gemfiles/Gemfile.rails-5.0-stable | 2 +- gemfiles/Gemfile.rails-5.0-stable.lock | 4 ++-- gemfiles/Gemfile.rails-5.2-stable | 2 +- gemfiles/Gemfile.rails-5.2-stable.lock | 2 +- gemfiles/Gemfile.rails-6.0-beta | 2 +- lib/devise/version.rb | 2 +- 13 files changed, 26 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c78169c..61c6c807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ### Unreleased +### 4.6.0 - 2019-02-07 + * enhancements * Allow to skip email and password change notifications (by @iorme1) * Include the use of `nil` for `allow_unconfirmed_access_for` in the docs (by @joaumg) diff --git a/Gemfile b/Gemfile index 7bf232dc..ce2e6ba0 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ platforms :jruby do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end # TODO: diff --git a/Gemfile.lock b/Gemfile.lock index 8c95b6c4..8e72438e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - devise (4.5.0) + devise (4.6.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -201,4 +201,4 @@ DEPENDENCIES webrat (= 0.7.3) BUNDLED WITH - 1.16.1 + 1.17.1 diff --git a/gemfiles/Gemfile.rails-4.1-stable b/gemfiles/Gemfile.rails-4.1-stable index f58f971a..69eff849 100644 --- a/gemfiles/Gemfile.rails-4.1-stable +++ b/gemfiles/Gemfile.rails-4.1-stable @@ -25,7 +25,7 @@ platforms :jruby do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end group :mongoid do diff --git a/gemfiles/Gemfile.rails-4.1-stable.lock b/gemfiles/Gemfile.rails-4.1-stable.lock index fda4a4fc..9008888f 100644 --- a/gemfiles/Gemfile.rails-4.1-stable.lock +++ b/gemfiles/Gemfile.rails-4.1-stable.lock @@ -21,7 +21,7 @@ GIT PATH remote: .. specs: - devise (4.5.0) + devise (4.6.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -137,8 +137,8 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) thor (0.19.4) - timecop (0.8.1) thread_safe (0.3.6) + timecop (0.8.1) tzinfo (1.2.2) thread_safe (~> 0.1) warden (1.2.7) @@ -170,4 +170,4 @@ DEPENDENCIES webrat (= 0.7.3) BUNDLED WITH - 1.16.1 + 1.17.3 diff --git a/gemfiles/Gemfile.rails-4.2-stable b/gemfiles/Gemfile.rails-4.2-stable index 262e49c0..bb35c5f2 100644 --- a/gemfiles/Gemfile.rails-4.2-stable +++ b/gemfiles/Gemfile.rails-4.2-stable @@ -26,7 +26,7 @@ platforms :jruby do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end group :mongoid do diff --git a/gemfiles/Gemfile.rails-4.2-stable.lock b/gemfiles/Gemfile.rails-4.2-stable.lock index 1e461fd4..910045cf 100644 --- a/gemfiles/Gemfile.rails-4.2-stable.lock +++ b/gemfiles/Gemfile.rails-4.2-stable.lock @@ -57,7 +57,7 @@ GIT PATH remote: .. specs: - devise (4.5.0) + devise (4.6.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -89,7 +89,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) + mini_portile2 (2.4.0) minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) @@ -105,8 +105,8 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) - nokogiri (1.7.0.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) oauth2 (1.3.1) faraday (>= 0.8, < 0.12) jwt (~> 1.0) @@ -143,9 +143,9 @@ GEM loofah (~> 2.0) rake (12.0.0) rdoc (5.1.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) ruby-openid (2.7.0) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -179,6 +179,7 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) mongoid (~> 4.0) + nokogiri (= 1.9.1) omniauth omniauth-facebook omniauth-oauth2 @@ -191,4 +192,4 @@ DEPENDENCIES webrat (= 0.7.3) BUNDLED WITH - 1.16.1 + 1.17.3 diff --git a/gemfiles/Gemfile.rails-5.0-stable b/gemfiles/Gemfile.rails-5.0-stable index 5171d107..902ef21a 100644 --- a/gemfiles/Gemfile.rails-5.0-stable +++ b/gemfiles/Gemfile.rails-5.0-stable @@ -25,7 +25,7 @@ group :test do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end # TODO: diff --git a/gemfiles/Gemfile.rails-5.0-stable.lock b/gemfiles/Gemfile.rails-5.0-stable.lock index cfcbaa58..61e0f648 100644 --- a/gemfiles/Gemfile.rails-5.0-stable.lock +++ b/gemfiles/Gemfile.rails-5.0-stable.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - devise (4.5.0) + devise (4.6.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -191,4 +191,4 @@ DEPENDENCIES webrat (= 0.7.3) BUNDLED WITH - 1.16.1 + 1.17.1 diff --git a/gemfiles/Gemfile.rails-5.2-stable b/gemfiles/Gemfile.rails-5.2-stable index 37d4664b..3fc1bb7c 100644 --- a/gemfiles/Gemfile.rails-5.2-stable +++ b/gemfiles/Gemfile.rails-5.2-stable @@ -23,5 +23,5 @@ group :test do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end diff --git a/gemfiles/Gemfile.rails-5.2-stable.lock b/gemfiles/Gemfile.rails-5.2-stable.lock index fc2f8fbd..27a92408 100644 --- a/gemfiles/Gemfile.rails-5.2-stable.lock +++ b/gemfiles/Gemfile.rails-5.2-stable.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - devise (4.5.0) + devise (4.6.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) diff --git a/gemfiles/Gemfile.rails-6.0-beta b/gemfiles/Gemfile.rails-6.0-beta index 8ea4f706..4e13c52a 100644 --- a/gemfiles/Gemfile.rails-6.0-beta +++ b/gemfiles/Gemfile.rails-6.0-beta @@ -23,5 +23,5 @@ group :test do end platforms :ruby do - gem "sqlite3" + gem "sqlite3", "~> 1.3.6" end diff --git a/lib/devise/version.rb b/lib/devise/version.rb index 66d69f13..e3dad6fb 100644 --- a/lib/devise/version.rb +++ b/lib/devise/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Devise - VERSION = "4.5.0".freeze + VERSION = "4.6.0".freeze end