projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2257-inequality-conditions' into 2290-user-activity
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index 49a488840576c831cf4c8dc56283599bfa19c332..6ae12f75db306278fcb1227f4b711a962f66b84f 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-24,9
+24,9
@@
group :assets do
end
gem 'jquery-rails'
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'
gem 'less'
gem 'less-rails'
@@
-43,7
+43,7
@@
gem 'less-rails'
# gem 'capistrano'
# To use debugger
# gem 'capistrano'
# To use debugger
-#
gem 'debugger
'
+#
gem 'byebug
'
gem 'rvm-capistrano', :group => :test
gem 'rvm-capistrano', :group => :test
@@
-54,3
+54,4
@@
gem 'RedCloth'
gem 'piwik_analytics'
gem 'httpclient'
gem 'themes_for_rails'
gem 'piwik_analytics'
gem 'httpclient'
gem 'themes_for_rails'
+gem "deep_merge", :require => 'deep_merge/rails_compat'
\ No newline at end of file