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

bump heroku and fog

Browse source
This commit is contained in:
Jonne Haß 2012-09-20 20:11:07 +02:00
parent 0560cedab0
commit 254d4fd335
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -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
@ -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

24
Gemfile.lock
View file

@ -146,7 +146,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 +163,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 +204,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)
@ -243,6 +243,7 @@ GEM
jquery-ui-rails (0.2.2)
jquery-rails
railties (>= 3.1.0)
jruby-pageant (1.1.1)
json (1.7.5)
kaminari (0.13.0)
actionpack (>= 3.0.0)
@ -274,7 +275,8 @@ GEM
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)
@ -474,7 +476,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,7 +486,7 @@ 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)