From ebd5e33e286843aace313d67a15735c6fd9ed93a Mon Sep 17 00:00:00 2001 From: Antti Hukkanen Date: Thu, 28 Nov 2019 20:16:22 +0200 Subject: [PATCH] Bump core dependencies to Decidim 0.19.x and module version to 0.19.0 --- Gemfile | 8 +- Gemfile.lock | 314 ++++++++++++------------- lib/decidim/access_requests/version.rb | 4 +- 3 files changed, 159 insertions(+), 167 deletions(-) diff --git a/Gemfile b/Gemfile index 12af289..08f164e 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "puma", "~> 3.12" gem "uglifier", "~> 4.1" group :development, :test do - gem "byebug", "~> 10.0", platform: :mri + gem "byebug", "~> 11.0", platform: :mri gem "decidim-dev", Decidim::AccessRequests::DECIDIM_VERSION end @@ -38,9 +38,3 @@ end # Remediate CVE-2019-5420 gem "railties", ">= 5.2.2.1" - -# See: https://github.com/decidim/decidim/pull/5303 -gem "ransack", "~> 2.1.1" - -# See https://github.com/decidim/decidim/issues/5410 -gem "sprockets", "~> 3.7.2" diff --git a/Gemfile.lock b/Gemfile.lock index 739d602..c36f502 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - decidim-access_requests (0.18.0) - decidim-admin (~> 0.18.0) - decidim-core (~> 0.18.0) - decidim-verifications (~> 0.18.0) + decidim-access_requests (0.19.0) + decidim-admin (~> 0.19.0) + decidim-core (~> 0.19.0) + decidim-verifications (~> 0.19.0) GEM remote: https://rubygems.org/ @@ -84,7 +84,7 @@ GEM bootsnap (1.4.5) msgpack (~> 1.0) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.1) capybara (3.29.0) addressable mini_mime (>= 0.1.3) @@ -135,192 +135,193 @@ GEM db-query-matchers (0.9.0) activesupport (>= 4.0, <= 6.0) rspec (~> 3.0) - decidim (0.18.1) - decidim-accountability (= 0.18.1) - decidim-admin (= 0.18.1) - decidim-api (= 0.18.1) - decidim-assemblies (= 0.18.1) - decidim-blogs (= 0.18.1) - decidim-budgets (= 0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - decidim-debates (= 0.18.1) - decidim-forms (= 0.18.1) - decidim-generators (= 0.18.1) - decidim-meetings (= 0.18.1) - decidim-pages (= 0.18.1) - decidim-participatory_processes (= 0.18.1) - decidim-proposals (= 0.18.1) - decidim-sortitions (= 0.18.1) - decidim-surveys (= 0.18.1) - decidim-system (= 0.18.1) - decidim-verifications (= 0.18.1) - decidim-accountability (0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - kaminari (~> 1.0) + decidim (0.19.0) + decidim-accountability (= 0.19.0) + decidim-admin (= 0.19.0) + decidim-api (= 0.19.0) + decidim-assemblies (= 0.19.0) + decidim-blogs (= 0.19.0) + decidim-budgets (= 0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + decidim-debates (= 0.19.0) + decidim-forms (= 0.19.0) + decidim-generators (= 0.19.0) + decidim-meetings (= 0.19.0) + decidim-pages (= 0.19.0) + decidim-participatory_processes (= 0.19.0) + decidim-proposals (= 0.19.0) + decidim-sortitions (= 0.19.0) + decidim-surveys (= 0.19.0) + decidim-system (= 0.19.0) + decidim-verifications (= 0.19.0) + decidim-accountability (0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + kaminari (~> 1.1) searchlight (~> 4.1) - decidim-admin (0.18.1) + decidim-admin (0.19.0) active_link_to (~> 1.0) - decidim-core (= 0.18.1) - devise (~> 4.6) + decidim-core (= 0.19.0) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) sassc (~> 1.12, >= 1.12.1) sassc-rails (~> 1.3) - decidim-api (0.18.1) + decidim-api (0.19.0) graphiql-rails (~> 1.4, < 1.5) - graphql (~> 1.6, < 1.8.11) + graphql (~> 1.9) rack-cors (~> 1.0) sprockets-es6 (~> 0.9.2) - decidim-assemblies (0.18.1) - decidim-core (= 0.18.1) - decidim-blogs (0.18.1) - decidim-admin (= 0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - httparty (~> 0.16.0) + decidim-assemblies (0.19.0) + decidim-core (= 0.19.0) + decidim-blogs (0.19.0) + decidim-admin (= 0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + httparty (~> 0.17) jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.0) - decidim-budgets (0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - kaminari (~> 1.0) + kaminari (~> 1.1) + decidim-budgets (0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + kaminari (~> 1.1) searchlight (~> 4.1) - decidim-comments (0.18.1) - decidim-core (= 0.18.1) - jquery-rails (~> 4.0) - decidim-core (0.18.1) + decidim-comments (0.19.0) + decidim-core (= 0.19.0) + jquery-rails (~> 4.3) + decidim-core (0.19.0) active_link_to (~> 1.0) anchored (>= 1.1.0) autoprefixer-rails (~> 8.0) batch-loader (~> 1.2) - carrierwave (~> 1.1) + carrierwave (~> 1.3) cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) - charlock_holmes (>= 0.7.6) + charlock_holmes (~> 0.7) date_validator (~> 0.9.0) - decidim-api (= 0.18.1) - devise (~> 4.6) + decidim-api (= 0.19.0) + devise (~> 4.7) devise-i18n (~> 1.2) - doorkeeper (~> 4.4) + doorkeeper (~> 5.1) doorkeeper-i18n (~> 4.0) etherpad-lite (~> 0.3) file_validators (~> 2.1) foundation-rails (~> 6.4, < 6.5) foundation_rails_helper (~> 3.0) - geocoder (~> 1.4) - hashdiff (~> 0.3.7) - invisible_captcha (~> 0.10.0) + geocoder (~> 1.5) + hashdiff (>= 0.4.0, < 2.0.0) + invisible_captcha (~> 0.12) jquery-rails (~> 4.3) - kaminari (~> 1.0) - loofah (~> 2.0, >= 2.2.1) - mini_magick (~> 4.8) + kaminari (~> 1.1) + loofah (~> 2.2) + mini_magick (~> 4.9) mustache (~> 1.1.0) nobspw (~> 0.6.0) - omniauth (~> 1.6) - omniauth-facebook (~> 4.0) - omniauth-google-oauth2 (~> 0.5.0) + omniauth (~> 1.9) + omniauth-facebook (~> 5.0) + omniauth-google-oauth2 (~> 0.7) omniauth-rails_csrf_protection (~> 0.1) omniauth-twitter (~> 1.4) - paper_trail (~> 9.0) - pg (>= 0.18, < 2) - pg_search (~> 2.1, >= 2.1.0) - premailer-rails (~> 1.9) - rack (>= 2.0.6) - rack-attack (~> 5.2) + paper_trail (~> 10.3) + pg (~> 1.1.4, < 2) + pg_search (~> 2.2) + premailer-rails (~> 1.10) + rack (~> 2.0) + rack-attack (~> 6.0) rails (>= 5.2, < 6.0.x) rails-i18n (~> 5.0) rectify (~> 0.13.0) - redis (~> 4.0) - rubyzip (~> 1.2, >= 1.2.2) + redis (~> 4.1) + rubyzip (~> 2.0) sassc (~> 1.12, >= 1.12.1) sassc-rails (~> 1.3) - spreadsheet (~> 1.1) + social-share-button (~> 1.2, >= 1.2.1) + spreadsheet (~> 1.2) + sprockets (~> 3.7, < 4) sprockets-es6 (~> 0.9.2) - truncato (~> 0.7.10) - uglifier (~> 4.0) + truncato (~> 0.7) + uglifier (~> 4.1) valid_email2 (~> 2.1) wisper (~> 2.0) - decidim-debates (0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - kaminari (~> 1.0) + decidim-debates (0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + kaminari (~> 1.1) searchlight (~> 4.1) - decidim-dev (0.18.1) - byebug (~> 10.0) - capybara (~> 3.0) + decidim-dev (0.19.0) + byebug (~> 11.0) + capybara (~> 3.24) db-query-matchers (~> 0.9.0) - decidim (= 0.18.1) - erb_lint (~> 0.0.22) + decidim (= 0.19.0) + erb_lint (~> 0.0.28) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) - mdl (~> 0.4.0) - nokogiri (~> 1.8, >= 1.8.2) - puma (~> 3.11) + mdl (~> 0.5.0) + nokogiri (>= 1.10.4) + puma (~> 3.12) rails-controller-testing (~> 1.0) rspec-cells (~> 0.3.4) rspec-html-matchers (~> 0.9.1) rspec-rails (~> 3.7) rspec_junit_formatter (~> 0.3.0) - rubocop (~> 0.58.0) + rubocop (~> 0.71.0) + rubocop-rails (~> 2.0) rubocop-rspec (~> 1.21) - selenium-webdriver (~> 3.7) - simplecov (~> 0.13) + selenium-webdriver (~> 3.142) + simplecov (~> 0.16) system_test_html_screenshots (~> 0.1.1) - webmock (~> 3.0) + webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.18.1) - decidim-core (= 0.18.1) - decidim-generators (0.18.1) - decidim-core (= 0.18.1) - decidim-meetings (0.18.1) + decidim-forms (0.19.0) + decidim-core (= 0.19.0) + decidim-generators (0.19.0) + decidim-core (= 0.19.0) + decidim-meetings (0.19.0) cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) - decidim-core (= 0.18.1) - decidim-forms (= 0.18.1) - httparty (~> 0.16.0) - icalendar (~> 2.4) + decidim-core (= 0.19.0) + decidim-forms (= 0.19.0) + httparty (~> 0.17) + icalendar (~> 2.5) jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.0) + kaminari (~> 1.1) searchlight (~> 4.1) - decidim-pages (0.18.1) - decidim-core (= 0.18.1) - decidim-participatory_processes (0.18.1) - decidim-core (= 0.18.1) - decidim-proposals (0.18.1) + decidim-pages (0.19.0) + decidim-core (= 0.19.0) + decidim-participatory_processes (0.19.0) + decidim-core (= 0.19.0) + decidim-proposals (0.19.0) acts_as_list (~> 0.9) cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) diffy (~> 3.3) - doc2text (~> 0.4.0) + doc2text (~> 0.4.2) kaminari (~> 1.1) ransack (~> 2.1.1) redcarpet (~> 3.4) - social-share-button (~> 1.0) - decidim-sortitions (0.18.1) - decidim-admin (= 0.18.1) - decidim-comments (= 0.18.1) - decidim-core (= 0.18.1) - decidim-proposals (= 0.18.1) - social-share-button (~> 1.0) - decidim-surveys (0.18.1) - decidim-core (= 0.18.1) - decidim-forms (= 0.18.1) - decidim-system (0.18.1) + decidim-sortitions (0.19.0) + decidim-admin (= 0.19.0) + decidim-comments (= 0.19.0) + decidim-core (= 0.19.0) + decidim-proposals (= 0.19.0) + decidim-surveys (0.19.0) + decidim-core (= 0.19.0) + decidim-forms (= 0.19.0) + decidim-system (0.19.0) active_link_to (~> 1.0) - decidim-core (= 0.18.1) - devise (~> 4.6) + decidim-core (= 0.19.0) + devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) sassc (~> 1.12, >= 1.12.1) sassc-rails (~> 1.3) - decidim-verifications (0.18.1) - decidim-core (= 0.18.1) + decidim-verifications (0.19.0) + decidim-core (= 0.19.0) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -339,14 +340,14 @@ GEM devise (>= 4.0.0) diff-lcs (1.3) diffy (3.3.0) - doc2text (0.4.1) - nokogiri (~> 1.8, >= 1.8.2) - rubyzip (~> 1.2, >= 1.2.2) + doc2text (0.4.2) + nokogiri (~> 1.10.0) + rubyzip (~> 2.0.0) docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.4.3) - railties (>= 4.2) + doorkeeper (5.2.2) + railties (>= 5) doorkeeper-i18n (4.0.1) equalizer (0.0.11) erb_lint (0.0.30) @@ -391,8 +392,8 @@ GEM graphiql-rails (1.4.11) railties sprockets-rails - graphql (1.8.10) - hashdiff (0.3.9) + graphql (1.9.15) + hashdiff (1.0.0) hashie (3.6.0) highline (2.0.3) html_tokenizer (0.0.7) @@ -400,7 +401,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.16.4) + httparty (0.17.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) i18n (1.7.0) @@ -419,7 +420,7 @@ GEM ice_cube (~> 0.16) ice_cube (0.16.3) ice_nine (0.11.2) - invisible_captcha (0.10.0) + invisible_captcha (0.13.0) rails (>= 3.2.0) jaro_winkler (1.5.4) jquery-rails (4.3.5) @@ -461,7 +462,7 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - mdl (0.4.0) + mdl (0.5.0) kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 1.7, >= 1.7.0) mixlib-config (~> 2.2, >= 2.2.1) @@ -497,12 +498,12 @@ GEM omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) - omniauth-facebook (4.0.0) + omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.5.4) - jwt (>= 1.5) + omniauth-google-oauth2 (0.8.0) + jwt (>= 2.0) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) + omniauth-oauth2 (>= 1.6) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -516,11 +517,9 @@ GEM omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - paper_trail (9.2.0) - activerecord (>= 4.2, < 5.3) - paper_trail-association_tracking (< 2) + paper_trail (10.3.1) + activerecord (>= 4.2) request_store (~> 1.1) - paper_trail-association_tracking (1.1.1) parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) @@ -528,7 +527,6 @@ GEM pg_search (2.3.0) activerecord (>= 4.2) activesupport (>= 4.2) - powerpack (0.1.2) premailer (1.11.1) addressable css_parser (>= 1.6.0) @@ -539,7 +537,7 @@ GEM public_suffix (4.0.1) puma (3.12.1) rack (2.0.7) - rack-attack (5.4.2) + rack-attack (6.2.1) rack (>= 1.0, < 3) rack-cors (1.1.0) rack (>= 2.0.0) @@ -634,19 +632,21 @@ GEM rspec-support (3.9.0) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.58.2) + rubocop (0.71.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.30.0) - rubocop (>= 0.58.0) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rails (2.0.1) + rack (>= 1.1) + rubocop (>= 0.70.0) + rubocop-rspec (1.37.0) + rubocop (>= 0.68.1) ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) - rubyzip (1.3.0) + rubyzip (2.0.0) safe_yaml (1.0.5) sass (3.4.25) sassc (1.12.1) @@ -725,10 +725,10 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.5.1) + webmock (3.7.6) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) @@ -742,20 +742,18 @@ PLATFORMS DEPENDENCIES bootsnap (~> 1.4) - byebug (~> 10.0) + byebug (~> 11.0) codecov - decidim (~> 0.18.0) + decidim (~> 0.19.0) decidim-access_requests! - decidim-dev (~> 0.18.0) + decidim-dev (~> 0.19.0) faker (~> 1.9) letter_opener_web (~> 1.3) listen (~> 3.1) puma (~> 3.12) railties (>= 5.2.2.1) - ransack (~> 2.1.1) spring (~> 2.0) spring-watcher-listen (~> 2.0) - sprockets (~> 3.7.2) uglifier (~> 4.1) web-console (~> 3.5) diff --git a/lib/decidim/access_requests/version.rb b/lib/decidim/access_requests/version.rb index 96e81f4..463f063 100644 --- a/lib/decidim/access_requests/version.rb +++ b/lib/decidim/access_requests/version.rb @@ -2,7 +2,7 @@ module Decidim module AccessRequests - VERSION = "0.18.0" - DECIDIM_VERSION = "~> 0.18.0" + VERSION = "0.19.0" + DECIDIM_VERSION = "~> 0.19.0" end end