projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14988: Refactors ArvadosBase class to not subclass ActiveRecord.
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index 5327cc8cf10695175e226724533fdb198d537935..30c5bfce83b4e8f182248ca19db52b8369b50335 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-4,16
+4,15
@@
source 'https://rubygems.org'
source 'https://rubygems.org'
-# Having a dependency '~> 4.1' make rails 4.2.10 to be installed when it's
-# supposed to avoid that.
-gem 'rails', '< 4.2'
+gem 'rails', '~> 5.0.0'
gem 'arvados', '>= 0.1.20150511150219'
gem 'arvados', '>= 0.1.20150511150219'
-gem 'activerecord-nulldb-adapter'
+gem 'activerecord-nulldb-adapter'
, git: 'https://github.com/curoverse/nulldb'
gem 'multi_json'
gem 'oj'
gem 'sass'
gem 'mime-types'
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
# Note: keeping this out of the "group :assets" section "may" allow us
# to use Coffescript for UJS responses. It also prevents a
@@
-25,7
+24,7
@@
gem 'coffee-rails'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails'
+ gem 'sass
c
-rails'
gem 'uglifier', '~> 2.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'uglifier', '~> 2.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@
-37,17
+36,19
@@
group :development do
gem 'ruby-debug-passenger'
gem 'rack-mini-profiler', require: false
gem 'flamegraph', require: false
gem 'ruby-debug-passenger'
gem 'rack-mini-profiler', require: false
gem 'flamegraph', require: false
+ #gem 'web-console', '~> 2.0'
end
group :test, :diagnostics, :performance do
gem 'minitest', '~> 5.10.3'
end
group :test, :diagnostics, :performance do
gem 'minitest', '~> 5.10.3'
- gem 'selenium-webdriver'
- gem 'capybara'
- gem 'poltergeist'
- gem 'headless'
+ gem 'selenium-webdriver'
, '~> 3'
+ gem 'capybara'
, '~> 2.5.0'
+ gem 'poltergeist'
, '~> 1.5.1'
+ gem 'headless'
, '~> 1.0.2'
end
group :test, :performance do
end
group :test, :performance do
+ gem 'byebug'
gem 'rails-perftest'
gem 'ruby-prof'
gem 'rvm-capistrano'
gem 'rails-perftest'
gem 'ruby-prof'
gem 'rvm-capistrano'
@@
-57,6
+58,7
@@
group :test, :performance do
gem 'simplecov', '~> 0.7', require: false
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
gem 'simplecov', '~> 0.7', require: false
gem 'simplecov-rcov', require: false
gem 'mocha', require: false
+ gem 'rails-controller-testing'
end
gem 'jquery-rails'
end
gem 'jquery-rails'
@@
-68,7
+70,12
@@
gem 'angularjs-rails', '~> 1.3.8'
gem 'less'
gem 'less-rails'
gem 'less'
gem 'less-rails'
-gem 'wiselinks'
+
+# 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
gem 'sshkey'
# To use ActiveModel has_secure_password