X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6024627680c17a54a24e1bd5d78416cf251562d0..0c14b79d003d6e1fda00cea3dcbdfca3b6d31014:/apps/workbench/Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 30c5bfce83..00dbad0860 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -4,22 +4,19 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.0.0'
-gem 'arvados', '>= 0.1.20150511150219'
+gem 'rails', '~> 5.2.0'
+gem 'arvados', '~> 2.1.5'
 
-gem 'activerecord-nulldb-adapter', git: 'https://github.com/curoverse/nulldb'
+gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb'
 gem 'multi_json'
 gem 'oj'
 gem 'sass'
 gem 'mime-types'
 gem 'responders', '~> 2.0'
 
-# Note: keeping this out of the "group :assets" section "may" allow us
-# to use Coffescript for UJS responses. It also prevents a
-# warning/problem when running tests: "WARN: tilt autoloading
-# 'coffee_script' in a non thread-safe way; explicit require
-# 'coffee_script' suggested."
-gem 'coffee-rails'
+# Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2
+# See: https://github.com/rails/sprockets-rails/issues/443
+gem 'sprockets', '~> 3.0'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -27,12 +24,17 @@ group :assets do
   gem 'sassc-rails'
   gem 'uglifier', '~> 2.0'
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
+  # See https://github.com/rails/execjs#readme for more supported runtimes
 end
 
-group :development do
+group :development, :test, :performance do
   gem 'byebug'
+  # Pinning launchy because 2.5 requires ruby >= 2.4, which arvbox currently
+  # doesn't have because of SSO.
+  gem 'launchy', '~> 2.4.0'
+end
+
+group :development do
   gem 'ruby-debug-passenger'
   gem 'rack-mini-profiler', require: false
   gem 'flamegraph', require: false
@@ -48,7 +50,6 @@ group :test, :diagnostics, :performance do
 end
 
 group :test, :performance do
-  gem 'byebug'
   gem 'rails-perftest'
   gem 'ruby-prof'
   gem 'rvm-capistrano'
@@ -62,20 +63,12 @@ group :test, :performance do
 end
 
 gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 3.1.0'
+gem 'bootstrap-sass', '~> 3.4.1'
 gem 'bootstrap-x-editable-rails'
 gem 'bootstrap-tab-history-rails'
 
 gem 'angularjs-rails', '~> 1.3.8'
 
-gem 'less'
-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 'sshkey'
 
 # To use ActiveModel has_secure_password
@@ -90,9 +83,6 @@ gem 'sshkey'
 # Deploy with Capistrano
 # gem 'capistrano'
 
-# To use debugger
-#gem 'byebug'
-
 gem 'passenger', :group => :production
 gem 'andand'
 gem 'RedCloth'
@@ -101,7 +91,7 @@ gem 'piwik_analytics'
 gem 'httpclient', '~> 2.5'
 
 # This fork has Rails 4 compatible routes
-gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
+gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails'
 
 gem "deep_merge", :require => 'deep_merge/rails_compat'
 
@@ -114,3 +104,7 @@ gem 'logstash-event'
 gem 'safe_yaml'
 
 gem 'npm-rails'
+
+# arvados-google-api-client and googleauth (and thus arvados) gems
+# depend on signet, but signet 0.12 is incompatible with ruby 2.3.
+gem 'signet', '< 0.12'