projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4359-project-paging' closes #4359
[arvados.git]
/
apps
/
workbench
/
Gemfile
diff --git
a/apps/workbench/Gemfile
b/apps/workbench/Gemfile
index 6e33113110575f012c1921918552c7ffdd05a27f..68f609d8db2bd60d21c88d14e692f9623e9e7a55 100644
(file)
--- a/
apps/workbench/Gemfile
+++ b/
apps/workbench/Gemfile
@@
-3,7
+3,7
@@
source 'https://rubygems.org'
gem 'rails', '~> 4.1.0'
gem 'minitest', '>= 5.0.0'
gem 'rails', '~> 4.1.0'
gem 'minitest', '>= 5.0.0'
-gem 'arvados', '>= 0.1.201409
03145725
'
+gem 'arvados', '>= 0.1.201409
17180103
'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@
-43,11
+43,13
@@
group :test do
# still mandatory.
gem 'simplecov', '~> 0.7.1', require: false
gem 'simplecov-rcov', require: false
# still mandatory.
gem 'simplecov', '~> 0.7.1', require: false
gem 'simplecov-rcov', require: false
+ gem 'mocha', require: false
end
gem 'jquery-rails'
gem 'bootstrap-sass', '~> 3.1.0'
gem 'bootstrap-x-editable-rails'
end
gem 'jquery-rails'
gem 'bootstrap-sass', '~> 3.1.0'
gem 'bootstrap-x-editable-rails'
+gem 'bootstrap-tab-history-rails'
gem 'less'
gem 'less-rails'
gem 'less'
gem 'less-rails'
@@
-74,7
+76,7
@@
gem 'andand'
gem 'RedCloth'
gem 'piwik_analytics'
gem 'RedCloth'
gem 'piwik_analytics'
-gem 'httpclient'
+gem 'httpclient'
, '~> 2.5.0'
# This fork has Rails 4 compatible routes
gem 'themes_for_rails', git: 'https://github.com/holtkampw/themes_for_rails', ref: '1fd2d7897d75ae0d6375f4c390df87b8e91ad417'
# This fork has Rails 4 compatible routes
gem 'themes_for_rails', git: 'https://github.com/holtkampw/themes_for_rails', ref: '1fd2d7897d75ae0d6375f4c390df87b8e91ad417'