projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10467-client-disconnect' closes #10467
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index 5ed9340b37c520134fc883190fb67eba3fc7f929..eac4fdf601c8d4033db80e99b72c71a02cfa4e0e 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-1,10
+1,9
@@
source 'https://rubygems.org'
source 'https://rubygems.org'
-gem 'rails', '~> 4.1.0'
-gem 'arvados', '>= 0.1.20150210011250'
-
-gem 'sqlite3'
+gem 'rails', '~> 4.1'
+gem 'arvados', '>= 0.1.20150511150219'
+gem 'activerecord-nulldb-adapter'
gem 'multi_json'
gem 'oj'
gem 'sass'
gem 'multi_json'
gem 'oj'
gem 'sass'
@@
-20,7
+19,7
@@
gem 'coffee-rails'
# in production environments by default.
group :assets do
gem 'sass-rails'
# in production environments by default.
group :assets do
gem 'sass-rails'
- gem 'uglifier', '
>= 1.0.3
'
+ gem 'uglifier', '
~> 2.0
'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platforms => :ruby
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platforms => :ruby
@@
-33,8
+32,8
@@
group :development do
gem 'flamegraph', require: false
end
gem 'flamegraph', require: false
end
-group :test, :diagnostics do
- gem 'minitest', '
>= 5.0
.0'
+group :test, :diagnostics
, :performance
do
+ gem 'minitest', '
~> 5
.0'
gem 'selenium-webdriver'
gem 'capybara'
gem 'poltergeist'
gem 'selenium-webdriver'
gem 'capybara'
gem 'poltergeist'
@@
-88,9
+87,14
@@
gem 'piwik_analytics'
gem 'httpclient', '~> 2.5'
# This fork has Rails 4 compatible routes
gem 'httpclient', '~> 2.5'
# This fork has Rails 4 compatible routes
-gem 'themes_for_rails', git: 'https://github.com/
holtkampw/themes_for_rails', ref: '1fd2d7897d75ae0d6375f4c390df87b8e91ad417
'
+gem 'themes_for_rails', git: 'https://github.com/
curoverse/themes_for_rails
'
gem "deep_merge", :require => 'deep_merge/rails_compat'
gem 'morrisjs-rails'
gem 'raphael-rails'
gem "deep_merge", :require => 'deep_merge/rails_compat'
gem 'morrisjs-rails'
gem 'raphael-rails'
+
+gem 'lograge'
+gem 'logstash-event'
+
+gem 'safe_yaml'