projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6057-public-projects-page
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index c12078345f6136b1dc142e8da153721b340dfbb8..d4f5e6cf3dd0b1aa37ae2068a0f32f557821b427 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-1,10
+1,9
@@
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
-gem 'arvados', '>= 0.1.20150209154913'
-
-gem 'sqlite3'
+gem 'arvados', '>= 0.1.20150511150219'
+gem 'activerecord-nulldb-adapter'
gem 'multi_json'
gem 'oj'
gem 'sass'
gem 'multi_json'
gem 'oj'
gem 'sass'
@@
-33,7
+32,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
+40,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'