From ddb03e7655749fda8b724e4b5af33446c22cfd47 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Wed, 11 Aug 2021 14:09:02 +0200 Subject: [PATCH] axlsx got renamed to caxlsx_rails --- Gemfile | 3 +-- Gemfile.lock | 22 ++++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index a8f07f25..5d48d673 100644 --- a/Gemfile +++ b/Gemfile @@ -140,8 +140,7 @@ gem 'prawn-rails' gem 'rqrcode' # to render XLS spreadsheets -gem 'axlsx', git: 'https://github.com/randym/axlsx.git' -gem 'axlsx_rails' +gem 'caxlsx_rails' # as error catcher gem 'sentry-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 73e60f60..6b882fae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/randym/axlsx.git - revision: 8e7b4b3b7259103452c191f73ce0bf64f66033fe - specs: - axlsx (3.0.0.pre) - htmlentities (~> 4.3, >= 4.3.4) - mimemagic (~> 0.3) - nokogiri (~> 1.8, >= 1.8.2) - rubyzip (~> 1.2, >= 1.2.1) - GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ @@ -79,9 +69,6 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws_cf_signer (0.1.3) - axlsx_rails (0.6.1) - actionpack (>= 3.1) - caxlsx (>= 3.0) bcrypt (3.1.16) bindex (0.6.0) bootstrap-sass (3.4.1) @@ -120,6 +107,9 @@ GEM marcel (~> 1.0) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.3.0, < 3) + caxlsx_rails (0.6.2) + actionpack (>= 3.1) + caxlsx (>= 3.0) chartkick (3.4.2) childprocess (3.0.0) chronic (0.10.2) @@ -303,9 +293,6 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.4.3) - nokogiri (~> 1) - rake mina (1.2.3) open4 (~> 1.3.4) rake @@ -643,8 +630,6 @@ DEPENDENCIES ajax-datatables-rails autoprefixer-rails awesome_nested_set - axlsx! - axlsx_rails bootstrap-sass (~> 3.4.0) bootstrap-switch-rails (~> 3.0.0) bootstrap3-datetimepicker-rails (~> 4.17.47) @@ -653,6 +638,7 @@ DEPENDENCIES capybara carrierwave carrierwave-bombshelter + caxlsx_rails chartkick climate_control cloudinary