projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
limit 100 instead of 1000
[arvados.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index e768c45735b46a3048dc18e7fa16ee2e5b91314d..e467f5fd7a1e07b38cfb85d6b8bbca1805e7167b 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-6,7
+6,10
@@
gem 'rails', '3.2.11'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
+gem 'pg'
+gem 'multi_json'
+gem 'oj'
# Gems used only for assets and not required
# in production environments by default.
# Gems used only for assets and not required
# in production environments by default.
@@
-15,12
+18,13
@@
group :assets do
gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-
#
gem 'therubyracer', :platforms => :ruby
+ gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
+gem 'anjlab-bootstrap-rails', '>= 2.2', :require => 'bootstrap-rails'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
@@
-39,3
+43,5
@@
gem 'jquery-rails'
gem 'rvm-capistrano', :group => :test
gem 'rvm-capistrano', :group => :test
+gem 'passenger', :group => :production
+