projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3408: Merge branch 'master' into 3408-production-datamanager
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index b24cb26c7dacb7d064702f6dad36c18213c56f17..d3746a830a6c32a4a0b94b6d9f85a5dbe94bca63 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-1,7
+1,7
@@
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
-gem 'arvados', '>= 0.1.20150
116063758
'
+gem 'arvados', '>= 0.1.20150
210011250
'
gem 'sqlite3'
gem 'sqlite3'
@@
-33,7
+33,7
@@
group :development do
gem 'flamegraph', require: false
end
gem 'flamegraph', require: false
end
-group :test, :diagnostics do
+group :test, :diagnostics
, :performance
do
gem 'minitest', '>= 5.0.0'
gem 'selenium-webdriver'
gem 'capybara'
gem 'minitest', '>= 5.0.0'
gem 'selenium-webdriver'
gem 'capybara'
@@
-41,7
+41,7
@@
group :test, :diagnostics do
gem 'headless'
end
gem 'headless'
end
-group :test do
+group :test
, :performance
do
gem 'rails-perftest'
gem 'ruby-prof'
gem 'rvm-capistrano'
gem 'rails-perftest'
gem 'ruby-prof'
gem 'rvm-capistrano'