Merge branch 'master' into 3661-copy-move-from-show

[arvados.git] / apps / workbench / Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 54580251cd93e2f27eb44ebf7c083f8697c23fe9..b96fee18e0d42451bc8ab6d152deb31d20f03ee7 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.1.0'
 gem 'minitest', '>= 5.0.0'
 
+gem 'arvados', '>= 0.1.20140917180103'
+
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
@@ -12,11 +14,17 @@ gem 'multi_json'
 gem 'oj'
 gem 'sass'
 
+# 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'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails'
-  gem 'coffee-rails'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', :platforms => :ruby
@@ -43,6 +51,8 @@ gem 'bootstrap-x-editable-rails'
 
 gem 'less'
 gem 'less-rails'
+gem 'wiselinks'
+gem 'sshkey'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'