diff --git a/Gemfile b/Gemfile index 29d545a1..36a3dcad 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.7.1' +ruby '2.7.6' gem 'rails', '~> 6.0.2', '>= 6.0.2.2' gem 'railties', '6.0.2.2' gem 'sprockets', '~> 4' @@ -52,7 +52,7 @@ gem 'paypal-sdk-rest', '1.4.6' gem 'activemerchant' gem 'paper_trail', '10.3.1' gem 'carrierwave', '0.11.2' -gem 'rmagick', '2.15.4' +gem 'rmagick' gem 'tinymce-rails', '4.3.13' gem 'wicked_pdf', '~> 2.0.1' gem 'wkhtmltopdf-binary', '~> 0.9.9.3' @@ -121,4 +121,6 @@ gem 'activerecord', '~> 6.0.2.2' gem "webpacker" gem 'hammerjs-rails' gem 'faraday', '1.0.1' -gem 'rack-cors', '~> 1.1', '>= 1.1.1' \ No newline at end of file +gem 'rack-cors', '~> 1.1', '>= 1.1.1' +gem 'delayed_job_active_record' +gem 'rexml', '~> 3.2', '>= 3.2.4' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index c2ed3252..32cf9f2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,6 +139,11 @@ GEM crass (1.0.6) daemons (1.2.3) debug_inspector (1.1.0) + delayed_job (4.1.11) + activesupport (>= 3.0, < 8.0) + delayed_job_active_record (4.1.7) + activerecord (>= 3.0, < 8.0) + delayed_job (>= 3.0, < 5) devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -340,6 +345,7 @@ GEM multi_json (~> 1.0) uuidtools (~> 2.1) xml-simple + pkg-config (1.5.1) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -423,7 +429,9 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rmagick (2.15.4) + rexml (3.2.5) + rmagick (5.1.0) + pkg-config (~> 1.4) rolify (5.1.0) roxml (4.1.1) activesupport (>= 4.0) @@ -578,6 +586,7 @@ DEPENDENCIES coffee-rails (= 5.0.0) copyright-header (= 1.0.15) daemons (= 1.2.3) + delayed_job_active_record devise devise-encryptable (= 0.2.0) elasticsearch-model (= 5.0.0) @@ -629,7 +638,8 @@ DEPENDENCIES rake (< 11.0) responders rest-client (= 1.8.0) - rmagick (= 2.15.4) + rexml (~> 3.2, >= 3.2.4) + rmagick rolify (= 5.1.0) roxml rspec-its (= 1.2.0) @@ -662,7 +672,7 @@ DEPENDENCIES yajl-ruby (~> 1.3.1) RUBY VERSION - ruby 2.7.1p83 + ruby 2.7.6p219 BUNDLED WITH - 2.1.4 + 2.2.3