13497: Merge branch 'master' into 13497-controller

[arvados.git] / apps / workbench / Gemfile

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 1e9a5cc70d8ece81b21d6c15233499dd31a35002..b62df6c0219b401110134603591a75aeee9bda0f 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -4,9 +4,7 @@
 
 source 'https://rubygems.org'
 
-# Having a dependency '~> 4.1' make rails 4.2.10 to be installed when it's
-# supposed to avoid that.
-gem 'rails', '< 4.2'
+gem 'rails', '~> 4.2.0'
 gem 'arvados', '>= 0.1.20150511150219'
 
 gem 'activerecord-nulldb-adapter'
@@ -14,6 +12,7 @@ gem 'multi_json'
 gem 'oj'
 gem 'sass'
 gem 'mime-types'
+gem 'responders', '~> 2.0'
 
 # Note: keeping this out of the "group :assets" section "may" allow us
 # to use Coffescript for UJS responses. It also prevents a
@@ -37,6 +36,7 @@ group :development do
   gem 'ruby-debug-passenger'
   gem 'rack-mini-profiler', require: false
   gem 'flamegraph', require: false
+  #gem 'web-console', '~> 2.0'
 end
 
 group :test, :diagnostics, :performance do