From 23a70b3597649d58014fa8968271b8c850306af9 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 6 May 2019 17:56:00 -0300 Subject: [PATCH] 14988: Disables wiselinks gem. Testing if it's really needed. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- apps/workbench/Gemfile | 2 +- apps/workbench/Gemfile.lock | 8 -------- apps/workbench/app/assets/javascripts/application.js | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 30c5bfce83..0be9a3a412 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -74,7 +74,7 @@ gem 'less-rails' # Wiselinks hasn't been updated for many years and it's using deprecated methods # Use our own Wiselinks fork until this PR is accepted: # https://github.com/igor-alexandrov/wiselinks/pull/116 -gem 'wiselinks', git: 'https://github.com/curoverse/wiselinks.git', branch: 'rails-5.1-compatibility' +# gem 'wiselinks', git: 'https://github.com/curoverse/wiselinks.git', branch: 'rails-5.1-compatibility' gem 'sshkey' diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index a4c9c24b6b..e39f207760 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -12,13 +12,6 @@ GIT themes_for_rails (0.5.1) rails (>= 3.0.0) -GIT - remote: https://github.com/curoverse/wiselinks.git - revision: 2c396ea5da7bbdef883fc6a70946b5886e182a80 - branch: rails-5.1-compatibility - specs: - wiselinks (1.2.2) - GEM remote: https://rubygems.org/ specs: @@ -369,7 +362,6 @@ DEPENDENCIES themes_for_rails! therubyracer uglifier (~> 2.0) - wiselinks! BUNDLED WITH 1.17.3 diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js index 270a4c766d..1898128133 100644 --- a/apps/workbench/app/assets/javascripts/application.js +++ b/apps/workbench/app/assets/javascripts/application.js @@ -26,7 +26,6 @@ //= require bootstrap/button //= require bootstrap3-editable/bootstrap-editable //= require bootstrap-tab-history -//= require wiselinks //= require angular //= require raphael //= require morris -- 2.30.2