projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7478-anm-spot-instances
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index a4338d0411eabfb56a4375e9b4f38766555a47f2..b62df6c0219b401110134603591a75aeee9bda0f 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-4,9
+4,7
@@
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', '~> 4.2.0'
gem 'arvados', '>= 0.1.20150511150219'
gem 'activerecord-nulldb-adapter'
gem 'arvados', '>= 0.1.20150511150219'
gem 'activerecord-nulldb-adapter'
@@
-14,6
+12,7
@@
gem 'multi_json'
gem 'oj'
gem 'sass'
gem 'mime-types'
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
@@
-37,6
+36,7
@@
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
end
group :test, :diagnostics, :performance do
@@
-44,9
+44,9
@@
group :test, :diagnostics, :performance do
# Selenium-webdriver 3.x is producing problems like the one described here:
# https://stackoverflow.com/questions/41310586/ruby-selenium-webdriver-unable-to-find-mozilla-geckodriver
gem 'selenium-webdriver', '~> 2.53.1'
# Selenium-webdriver 3.x is producing problems like the one described here:
# https://stackoverflow.com/questions/41310586/ruby-selenium-webdriver-unable-to-find-mozilla-geckodriver
gem 'selenium-webdriver', '~> 2.53.1'
- gem 'capybara'
- gem 'poltergeist'
- gem 'headless'
+ 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