Merge branch 'master' into 2257-inequality-conditions

[arvados.git] / apps / workbench / Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 35ae2c709d34ac86a25201682edffbc276c82b77..6ae12f75db306278fcb1227f4b711a962f66b84f 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -6,10 +6,10 @@ gem 'rails', '~> 3.2.0'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'sqlite3'
-gem 'pg'
 
 gem 'multi_json'
 gem 'oj'
+gem 'sass'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -24,9 +24,9 @@ group :assets do
 end
 
 gem 'jquery-rails'
-gem 'twitter-bootstrap-rails'
-gem 'anjlab-bootstrap-rails', '>= 2.2', :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
 
@@ -52,3 +52,6 @@ gem 'andand'
 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