diff --git a/CHANGELOG.md b/CHANGELOG.md index f19c7ea2b55..d29675fbd5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1) + ### Enhancements * Add your own content to the site ``, like analytics [#5590] by [@buren] diff --git a/Gemfile.lock b/Gemfile.lock index 6e490c00bc1..c213a2c11c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - activeadmin (2.0.0.alpha) + activeadmin (2.0.0.rc1) arbre (~> 1.1, >= 1.1.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) diff --git a/gemfiles/rails_50.gemfile.lock b/gemfiles/rails_50.gemfile.lock index 753686dc189..b68715f8341 100644 --- a/gemfiles/rails_50.gemfile.lock +++ b/gemfiles/rails_50.gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: .. specs: - activeadmin (2.0.0.alpha) + activeadmin (2.0.0.rc1) arbre (~> 1.1, >= 1.1.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) diff --git a/gemfiles/rails_51.gemfile.lock b/gemfiles/rails_51.gemfile.lock index 6b75a0a1c68..54fbabd6e33 100644 --- a/gemfiles/rails_51.gemfile.lock +++ b/gemfiles/rails_51.gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: .. specs: - activeadmin (2.0.0.alpha) + activeadmin (2.0.0.rc1) arbre (~> 1.1, >= 1.1.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) diff --git a/gemfiles/rails_60.gemfile.lock b/gemfiles/rails_60.gemfile.lock index 38d7e60cba6..da1e3dd6189 100644 --- a/gemfiles/rails_60.gemfile.lock +++ b/gemfiles/rails_60.gemfile.lock @@ -26,11 +26,17 @@ GIT remote: https://github.com/jruby/activerecord-jdbc-adapter revision: e49f1435167610e7801012da0d74d32234f8bc1d specs: + activerecord-jdbc-adapter (60.0-java) + activerecord (~> 6.0.0.beta3) + activerecord-jdbcsqlite3-adapter (60.0-java) + activerecord-jdbc-adapter (= 60.0) + jdbc-sqlite3 (~> 3.8, < 3.30) + jdbc-sqlite3 (3.20.1) PATH remote: .. specs: - activeadmin (2.0.0.alpha) + activeadmin (2.0.0.rc1) arbre (~> 1.1, >= 1.1.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) @@ -112,6 +118,7 @@ GEM execjs (~> 2.0) backports (3.12.0) bcrypt (3.1.12) + bcrypt (3.1.12-java) builder (3.2.3) byebug (11.0.0) capybara (3.14.0) @@ -167,6 +174,7 @@ GEM erubi (1.8.0) execjs (2.7.0) ffi (1.10.0) + ffi (1.10.0-java) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) @@ -188,7 +196,9 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jruby-openssl (0.10.2-java) json (2.2.0) + json (2.2.0-java) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -203,6 +213,9 @@ GEM kaminari-core (1.1.1) launchy (2.4.3) addressable (~> 2.3) + launchy (2.4.3-java) + addressable (~> 2.3) + spoon (~> 0.0.1) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -221,8 +234,10 @@ GEM multi_json (1.13.1) multi_test (0.1.2) nio4r (2.3.1) + nio4r (2.3.1-java) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) + nokogiri (1.10.1-java) orm_adapter (0.5.0) parallel (1.14.0) parallel_tests (2.28.0) @@ -231,6 +246,10 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + pry (0.12.2-java) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + spoon (~> 0.0) pry-byebug (3.7.0) byebug (~> 11.0) pry (~> 0.10) @@ -315,6 +334,8 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) + spoon (0.0.6) + ffi sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -329,18 +350,22 @@ GEM sqlite3 (1.3.13) thor (0.20.3) thread_safe (0.3.6) + thread_safe (0.3.6-java) tzinfo (1.2.5) thread_safe (~> 0.1) warden (1.2.8) rack (>= 2.0.6) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) + websocket-driver (0.7.0-java) + websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (1.3.3) PLATFORMS + java ruby DEPENDENCIES diff --git a/lib/active_admin/version.rb b/lib/active_admin/version.rb index f2a4c12d4dc..12a60a95144 100644 --- a/lib/active_admin/version.rb +++ b/lib/active_admin/version.rb @@ -1,3 +1,3 @@ module ActiveAdmin - VERSION = '2.0.0.alpha' + VERSION = '2.0.0.rc1' end diff --git a/package-lock.json b/package-lock.json index 77517ca6cc6..8e059f5d4d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "activeadmin", - "version": "2.0.0-alpha", + "version": "2.0.0-rc1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2a634dd4bcd..5d5e6ebc6cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "activeadmin", - "version": "2.0.0-alpha", + "version": "2.0.0-rc1", "description": "The administration framework for Ruby on Rails.", "repository": { "type": "git",