projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6652: Added assertion and changed assertion to use assert_text instead
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index b51f674d90f68bfb50d9304068f915e42b04aea4..e35cc83ece303aec8b84c4e43e9a15f0258ba7d4 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.20150313191637'
-
-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'
@@
-88,7
+87,7
@@
gem 'piwik_analytics'
gem 'httpclient', '~> 2.5'
# This fork has Rails 4 compatible routes
gem 'httpclient', '~> 2.5'
# This fork has Rails 4 compatible routes
-gem 'themes_for_rails', git: 'https://github.com/
holtkampw/themes_for_rails', ref: '1fd2d7897d75ae0d6375f4c390df87b8e91ad417
'
+gem 'themes_for_rails', git: 'https://github.com/
curoverse/themes_for_rails
'
gem "deep_merge", :require => 'deep_merge/rails_compat'
gem "deep_merge", :require => 'deep_merge/rails_compat'