Merge branch 'master' of git.clinicalfuture.com:arvados into 1692-redesign-dashboard

[arvados.git] / apps / workbench / Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 1a516a5d71382afe703bf6ff8cace9d292b142ff..7035736a392daaa813f21986bf803df37d763a6c 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -1,21 +1,21 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.11'
+gem 'rails', '~> 3.2.0'
 
 # Bundle edge Rails instead:
 # 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.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 3.2.0'
+  gem 'coffee-rails', '~> 3.2.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', :platforms => :ruby
@@ -25,8 +25,7 @@ end
 
 gem 'jquery-rails'
 gem 'twitter-bootstrap-rails'
-gem 'anjlab-bootstrap-rails', '>= 2.2', :require => 'bootstrap-rails'
-gem 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', '~> 2.3', :require => 'bootstrap-rails'
 gem 'bootstrap-editable-rails'
 gem 'less'
 gem 'less-rails'
@@ -50,3 +49,6 @@ gem 'rvm-capistrano', :group => :test
 
 gem 'passenger', :group => :production
 gem 'andand'
+gem 'RedCloth'
+
+gem 'piwik_analytics'