From 5f71df182b4e798bf1708d7836e445a746634256 Mon Sep 17 00:00:00 2001 From: Mat Date: Mon, 10 Jan 2022 13:47:10 +0100 Subject: [PATCH 1/2] Update gemspec for rails7 --- mokio.gemspec | 72 ++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/mokio.gemspec b/mokio.gemspec index e37688f..91100b2 100644 --- a/mokio.gemspec +++ b/mokio.gemspec @@ -54,66 +54,62 @@ Gem::Specification.new do |s| s.test_files = Dir["spec/**/*"] # ============================================================================ - s.add_dependency 'rake', '~> 13.0.1' #-----OLD: '~> 10.3','>= 10.3.1' - s.add_dependency 'rails', '~> 6.0.1' #-----OLD: '~> 5.2.1' - s.add_dependency 'sass-rails', '~> 6.0.0' #-----OLD: '~> 5.0.0' - s.add_dependency 'coffee-rails', '~> 5.0.0' #-----OLD: '~> 4.0','>= 4.0.0' - s.add_dependency 'haml-rails', '~> 2.0.1' #-----OLD: '~> 1' - s.add_dependency 'fancybox2-rails', '~> 0.2.7' #-----OLD: '~> 0.2.7' - s.add_dependency 'sunspot_rails', '~> 2.5.0' #-----OLD: '~> 2.2','>= 2.1.0' - s.add_dependency 'jquery-ui-rails', '~> 4.2.1' #-----NEW: '~> 6.0.1' PROBLEMS: cant find dependency in js - s.add_dependency 'jquery-rails', '~> 4.3.5' #-----OLD: '~> 4.1' - s.add_dependency 'jquery-datatables-rails', '~> 3.4.0' #-----OLD: '~> 1.12','>= 1.12.2' - s.add_dependency 'uglifier', '~> 4.2.0' #-----OLD: '~> 2.7','>= 1.3.0' - s.add_dependency 'cancancan', '~> 3.0.1' #-----OLD: '~> 1.7' - s.add_dependency 'simple_form', '>= 5.0.1' #-----OLD: '>= 3.4' - s.add_dependency 'ckeditor', '~> 4.3.0' #-----OLD: '~> 4.2' - s.add_dependency 'carrierwave', '~> 2.2.2' #-----OLD: '~> 0.10', '>= 0.10.0' - s.add_dependency 'rmagick', '~> 4.0.0' #-----OLD: '~> 2.13', '>= 2.13.2' - s.add_dependency 'mini_magick', '~> 4.10.1' #-----OLD: '~> 3.7', '>= 3.7.0' - s.add_dependency 'amoeba', '~> 3.1.0' #-----OLD: '~> 3.0' - s.add_dependency 'ancestry', '~> 3.0.7' #-----OLD: '~> 2.1', '>= 2.1.0' - s.add_dependency 'acts_as_list', '~> 1.0.0' #-----OLD: '~> 0.4', '>= 0.4.0' - s.add_dependency 'will_paginate', '~> 3.2.1' #-----OLD: '~> 3.0', '>= 3.0.5' - s.add_dependency 'friendly_id', '~> 5.3.0' #-----OLD: '~> 5.0', '>= 5.0.3' - s.add_dependency 'devise', '~> 4.7.1' #-----OLD: '~> 4.2' - s.add_dependency 'slim-rails', '~> 3.2.0' #-----OLD: '~> 3.1' + s.add_dependency 'rake' + s.add_dependency 'rails', '~> 7.0.1' #-----OLD: '~> 5.2.1' + s.add_dependency 'sass-rails' + s.add_dependency 'coffee-rails' + s.add_dependency 'haml-rails' + s.add_dependency 'fancybox2-rails' + s.add_dependency 'sunspot_rails' + s.add_dependency 'jquery-ui-rails' + s.add_dependency 'jquery-rails' + s.add_dependency 'jquery-datatables-rails' + s.add_dependency 'uglifier' + s.add_dependency 'cancancan' + s.add_dependency 'simple_form' + s.add_dependency 'ckeditor', '~> 4.3' + s.add_dependency 'carrierwave' + s.add_dependency 'rmagick' + s.add_dependency 'mini_magick' + s.add_dependency 'amoeba' + s.add_dependency 'ancestry' + s.add_dependency 'acts_as_list' + s.add_dependency 'will_paginate' + s.add_dependency 'friendly_id' + s.add_dependency 'devise' + s.add_dependency 'slim-rails' # ============================================================================ - s.add_development_dependency 'rspec', '~> 3.9.0' #-----OLD: '~> 3.5' - s.add_development_dependency 'capybara', '~> 2.18.0' #-----OLD: '~> 2.7', '>= 2.2.1' + s.add_development_dependency 'rspec' + s.add_development_dependency 'capybara' # ============================================================================ # youtubeit dependency - no compatible with rails 6.0.1 #s.add_dependency 'youtube_it', '~> 2.4.3'#, '>= 2.4.3' #-----OLD: '~> 2.4', '>= 2.4.3' #s.add_dependency 'faraday', '~> 0.9', '>= 0.7.6' #-----OLD: '~> 0.9', '>= 0.7.6' # video gallery dependency - s.add_dependency 'video_info', '~> 2.3', '>= 2.3.1' #-----OLD: '~> 2.3', '>= 2.3.1' + s.add_dependency 'video_info' # NOT UPDATED - s.add_dependency 'bootstrap-wysihtml5-rails', '~> 0.3', '>= 0.3.1.23' - s.add_dependency 'bootstrap-switch-rails', '2.0.0' # TODO problems with >2.0.0 + s.add_dependency 'bootstrap-wysihtml5-rails' + s.add_dependency 'bootstrap-switch-rails' # NOT UPDATED - END # REMOVE? - s.add_dependency 'validates', '~> 0.0', '>= 0.0.8' #-----OLD: '~> 0.0', '>= 0.0.8' - s.add_dependency 'deface', '~> 1.0', '>= 1.0.0' #-----OLD: '~> 1.0', '>= 1.0.0' + s.add_dependency 'validates' + s.add_dependency 'deface' # not used - s.add_dependency 'disqus', '~> 1.0', '>= 1.0.4' #-----OLD: '~> 1.0', '>= 1.0.4' + s.add_dependency 'disqus' # REMOVE END # SHOULDE BE CHANGED? - s.add_dependency 'role_model', '~> 0.8.2' #-----OLD: '~> 0.8', '>= 0.8.1' + s.add_dependency 'role_model' # SHOULDE BE CHANGED END # ============================================================================ #------------------------------- RAILS 6 DEPENDENCY WORK IN PROGRESS -------------------- - # webpacker - s.add_dependency 'rack-proxy', '~> 0.6.5' - s.add_dependency 'webpacker', '~> 4.2.0' - # factorybot - s.add_development_dependency 'factory_bot', '~> 5.1.1' + # s.add_development_dependency 'factory_bot', '~> 5.1.1' # TODO END From 0affa365015fc898c6deaaab8a6385345f11d809 Mon Sep 17 00:00:00 2001 From: Mat Date: Tue, 11 Jan 2022 11:47:12 +0100 Subject: [PATCH 2/2] Fix JS --- app/assets/javascripts/backend/head.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/backend/head.js b/app/assets/javascripts/backend/head.js index ade694a..011ce91 100755 --- a/app/assets/javascripts/backend/head.js +++ b/app/assets/javascripts/backend/head.js @@ -1,13 +1,12 @@ // ! Important plugins put in all pages //= require jquery2 // require jquery.turbolinks -//= require jquery.ui.all +//= require jquery-ui //= require jquery_ujs // Jquery migrate adds methods removed in newest jquery but still used by plugins //= require backend/head/jquery-migrate-1.2.1 -//= require backend/bootstrap/bootstrap //= require backend/head/jquery.cookie //= require backend/head/jquery.mousewheel // ! @@ -18,3 +17,4 @@ // Ckeditor //= require backend/mokio_dynamic_fields //= require backend/lodash/lodash +//= require backend/bootstrap/bootstrap