nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3593 from diaspora/update_gems

Browse source 
Update gems / participation wanted
This commit is contained in:
Jonne Haß 2012-09-26 11:11:28 -07:00
commit 5bea630910
2 changed files with 45 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile
View file

@ -36,7 +36,7 @@ gem 'newrelic_rpm', '3.3.5'
gem "rpm_contrib", '2.1.11'
group :production do # we don't install these on travis to speed up test runs
gem 'rails_admin', :git => 'git://github.com/halida/rails_admin.git'
gem 'rails_admin', '0.1.1'
gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
gem 'rack-rewrite', '1.2.1', :require => false
@ -56,7 +56,7 @@ end
gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
# database
gem "activerecord-import", "0.2.10"
gem "activerecord-import", "0.2.11"
gem 'foreigner', '1.2.1'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
@ -65,7 +65,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading
gem 'carrierwave', '0.6.2'
gem 'fog', '1.4.0'
gem 'fog', '1.6.0'
gem 'mini_magick', '3.4'
# JSON and API
@ -126,10 +126,10 @@ group :assets do
gem 'uglifier', '1.3.0'
# asset_sync is required as needed by application.rb
gem "asset_sync", '0.4.2', :require => nil
gem "asset_sync", '0.5.0', :require => nil
end
gem 'jquery-rails', '2.0.2'
gem 'jquery-rails', '2.1.3'
# web
@ -170,7 +170,7 @@ group :test, :development do
end
group :development do
gem 'heroku', '2.28.12'
gem 'heroku', '2.31.4'
gem 'heroku_san', '3.0.4'
gem 'capistrano', '2.12.0', :require => false
gem 'capistrano_colors', '0.5.5', :require => false

83
Gemfile.lock
View file

@ -1,21 +1,3 @@
GIT
remote: git://github.com/halida/rails_admin.git
revision: 590dceb10812a9207e42dbccecd5d1031715ae80
specs:
rails_admin (0.0.3)
bbenezech-nested_form (~> 0.0.6)
bootstrap-sass (~> 2.0, >= 2.0.3)
builder (~> 3.0)
coffee-rails (~> 3.1)
haml (~> 3.1)
jquery-rails (>= 1.0.17)
jquery-ui-rails (~> 0.2.2)
kaminari (~> 0.12)
rack-pjax (~> 0.5)
rails (~> 3.1)
remotipart (~> 1.0)
sass-rails (~> 3.1)
GIT
remote: https://github.com/Empact/roxml.git
revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
@ -62,7 +44,7 @@ GEM
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-import (0.2.10)
activerecord-import (0.2.11)
activerecord (~> 3.0)
activerecord (~> 3.0)
activeresource (3.2.8)
@ -82,10 +64,9 @@ GEM
activesupport
builder
arel (3.0.2)
asset_sync (0.4.2)
asset_sync (0.5.0)
activemodel
fog
bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.1.0.0)
builder (3.0.3)
@ -146,7 +127,7 @@ GEM
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
excon (0.14.3)
excon (0.16.2)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.1.0)
@ -163,9 +144,9 @@ GEM
fixture_builder (0.3.4)
activerecord (>= 2)
activesupport (>= 2)
fog (1.4.0)
fog (1.6.0)
builder
excon (~> 0.14.0)
excon (~> 0.14)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@ -204,14 +185,14 @@ GEM
sprockets (>= 2.0.3)
tilt
hashie (1.2.0)
heroku (2.28.12)
heroku-api (~> 0.2.8)
heroku (2.31.4)
heroku-api (~> 0.3.5)
launchy (>= 0.3.2)
netrc (~> 0.7.5)
netrc (~> 0.7.7)
rest-client (~> 1.6.1)
rubyzip
heroku-api (0.2.8)
excon (~> 0.14.3)
heroku-api (0.3.5)
excon (~> 0.16.1)
heroku_san (3.0.4)
activesupport
heroku (>= 2)
@ -220,7 +201,6 @@ GEM
highline (1.6.12)
hike (1.2.1)
hodel_3000_compliant_logger (0.1.0)
hpricot (0.8.6)
http_accept_language (1.0.2)
httpauth (0.1)
i18n (0.6.1)
@ -237,17 +217,17 @@ GEM
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
jquery-ui-rails (0.2.2)
jquery-ui-rails (2.0.1)
jquery-rails
railties (>= 3.1.0)
jruby-pageant (1.1.1)
json (1.7.5)
kaminari (0.13.0)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
kgio (2.7.4)
launchy (2.1.2)
addressable (~> 2.3)
@ -270,11 +250,13 @@ GEM
multi_json (1.3.6)
multipart-post (1.1.5)
mysql2 (0.3.11)
nested_form (0.2.3)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.5.2)
net-ssh (2.6.0)
jruby-pageant (>= 1.1.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
netrc (0.7.7)
@ -316,8 +298,8 @@ GEM
rack-mobile-detect (0.4.0)
rack
rack-piwik (0.1.3)
rack-pjax (0.5.9)
hpricot (~> 0.8.6)
rack-pjax (0.6.0)
nokogiri (~> 1.5)
rack (~> 1.3)
rack-protection (1.2.0)
rack
@ -336,6 +318,19 @@ GEM
railties (= 3.2.8)
rails-i18n (0.6.6)
i18n (~> 0.5)
rails_admin (0.1.1)
bootstrap-sass (~> 2.0)
builder (~> 3.0)
coffee-rails (~> 3.1)
haml (~> 3.1)
jquery-rails (~> 2.0)
jquery-ui-rails (~> 2.0)
kaminari (~> 0.12)
nested_form (~> 0.2.3)
rack-pjax (~> 0.5)
rails (~> 3.1)
remotipart (~> 1.0)
sass-rails (~> 3.1)
rails_autolink (1.0.9)
rails (~> 3.1)
railties (3.2.8)
@ -451,12 +446,12 @@ PLATFORMS
ruby
DEPENDENCIES
activerecord-import (= 0.2.10)
activerecord-import (= 0.2.11)
acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4.1)
addressable (= 2.3.2)
airbrake (= 3.1.0)
asset_sync (= 0.4.2)
asset_sync (= 0.5.0)
bootstrap-sass (= 2.1.0.0)
bundler (> 1.1.0)
capistrano (= 2.12.0)
@ -474,7 +469,7 @@ DEPENDENCIES
faraday_middleware (= 0.8.8)
fastercsv (= 1.5.5)
fixture_builder (= 0.3.4)
fog (= 1.4.0)
fog (= 1.6.0)
foreigner (= 1.2.1)
foreman (= 0.59)
fuubar (= 1.0.0)
@ -484,12 +479,12 @@ DEPENDENCIES
guard-spork (= 0.8.0)
haml (= 3.1.7)
handlebars_assets (= 0.6.5)
heroku (= 2.28.12)
heroku (= 2.31.4)
heroku_san (= 3.0.4)
http_accept_language (= 1.0.2)
i18n-inflector-rails (~> 1.0)
jasmine (= 1.2.1)
jquery-rails (= 2.0.2)
jquery-rails (= 2.1.3)
json (= 1.7.5)
markerb!
messagebus_ruby_api (= 1.0.3)
@ -511,7 +506,7 @@ DEPENDENCIES
rack-ssl (= 1.3.2)
rails (= 3.2.8)
rails-i18n
rails_admin!
rails_admin (= 0.1.1)
rails_autolink (= 1.0.9)
redcarpet (= 2.1.1)
remotipart (= 1.0.2)