[ARVADOS] updated: 1.3.0-728-g23a70b359
Git user
git at public.curoverse.com
Mon May 6 20:56:47 UTC 2019
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 8 --------
apps/workbench/app/assets/javascripts/application.js | 1 -
apps/workbench/app/controllers/actions_controller.rb | 2 +-
4 files changed, 2 insertions(+), 11 deletions(-)
via 23a70b3597649d58014fa8968271b8c850306af9 (commit)
via d8f87dab97946fd7c9f4b4c40b2f13c0962d21a2 (commit)
from 263813b4e3d609b85de837b24cb0232a9675590f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 23a70b3597649d58014fa8968271b8c850306af9
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Mon May 6 17:56:00 2019 -0300
14988: Disables wiselinks gem. Testing if it's really needed.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 30c5bfce8..0be9a3a41 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 a4c9c24b6..e39f20776 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 270a4c766..189812813 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
commit d8f87dab97946fd7c9f4b4c40b2f13c0962d21a2
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Mon May 6 17:52:20 2019 -0300
14988: Removes deprecation warning about rendering nothing.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 065dce521..4f77a1be4 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -203,7 +203,7 @@ You can try recreating the collection to get a copy with full provenance data."
respond_to do |format|
IssueReporter.send_report(current_user, params).deliver
- format.js {render nothing: true}
+ format.js {render body: nil}
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list