X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4068171eb8ee0cb9fd57e10ff024e04464438891..366c5db829a38cfceb5894a4af5ee4c3ec5901c8:/apps/workbench/Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 49a4888405..6ae12f75db 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -24,9 +24,9 @@ group :assets do
 end
 
 gem 'jquery-rails'
-gem 'twitter-bootstrap-rails'
-gem 'anjlab-bootstrap-rails', '~> 2.3', :require => 'bootstrap-rails'
-gem 'bootstrap-editable-rails'
+gem 'bootstrap-sass', '~> 3.1.0'
+gem 'bootstrap-x-editable-rails'
+
 gem 'less'
 gem 'less-rails'
 
@@ -43,7 +43,7 @@ gem 'less-rails'
 # gem 'capistrano'
 
 # To use debugger
-# gem 'debugger'
+#gem 'byebug'
 
 gem 'rvm-capistrano', :group => :test
 
@@ -54,3 +54,4 @@ gem 'RedCloth'
 gem 'piwik_analytics'
 gem 'httpclient'
 gem 'themes_for_rails'
+gem "deep_merge", :require => 'deep_merge/rails_compat'
\ No newline at end of file