From b9f570c68d8f0f45863e845df8688d399b21baa9 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 17 Sep 2020 00:40:32 +0530
Subject: [PATCH] Use jquery-ui-rails instead of rails-assets-jquery.ui

closes #8147
---
 Gemfile                        | 2 +-
 Gemfile.lock                   | 6 +++---
 app/assets/javascripts/main.js | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5e77e7ab2..c4a1e64a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,13 +96,13 @@ gem "entypo-rails", "3.0.0"
 
 gem "handlebars_assets", "0.23.8"
 gem "jquery-rails",      "4.3.5"
+gem "jquery-ui-rails",   "5.0.5"
 gem "js-routes",         "1.4.9"
 gem "js_image_paths",    "0.1.1"
 gem "sprockets-es6",     "0.9.2"
 
 source "https://gems.diasporafoundation.org" do
   gem "rails-assets-jquery",                              "3.4.1" # Should be kept in sync with jquery-rails
-  gem "rails-assets-jquery.ui",                           "1.11.4"
 
   gem "rails-assets-highlightjs",                         "9.12.0"
   gem "rails-assets-markdown-it",                         "8.4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9cfac5a35..c1bfc2a91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -356,6 +356,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     js-routes (1.4.9)
       railties (>= 4)
       sprockets-rails
@@ -556,8 +558,6 @@ GEM
       rails-assets-jquery
     rails-assets-jquery.are-you-sure (1.9.0)
       rails-assets-jquery (>= 1.4.2)
-    rails-assets-jquery.ui (1.11.4)
-      rails-assets-jquery (>= 1.6)
     rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
     rails-assets-markdown-it (8.4.2)
     rails-assets-markdown-it-diaspora-mention (1.2.0)
@@ -826,6 +826,7 @@ DEPENDENCIES
   jasmine (= 3.7.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.3.5)
+  jquery-ui-rails (= 5.0.5)
   js-routes (= 1.4.9)
   js_image_paths (= 0.1.1)
   json (= 2.3.0)
@@ -873,7 +874,6 @@ DEPENDENCIES
   rails-assets-jquery-placeholder (= 2.3.1)!
   rails-assets-jquery-textchange (= 0.2.3)!
   rails-assets-jquery.are-you-sure (= 1.9.0)!
-  rails-assets-jquery.ui (= 1.11.4)!
   rails-assets-markdown-it (= 8.4.2)!
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
   rails-assets-markdown-it-diaspora-mention (= 1.2.0)!
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index a0518761c..76d020cd7 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -10,10 +10,10 @@
 //= require charcount
 //= require jquery-placeholder
 //= require jquery.timeago
-//= require jquery.ui/ui/core
-//= require jquery.ui/ui/widget
-//= require jquery.ui/ui/mouse
-//= require jquery.ui/ui/sortable
+//= require jquery-ui/core
+//= require jquery-ui/widget
+//= require jquery-ui/mouse
+//= require jquery-ui/sortable
 //= require keycodes
 //= require jquery.autoSuggest.custom
 //= require fine-uploader/fine-uploader.core