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

bump fog

Browse source
This commit is contained in:
Jonne Haß 2014-06-01 13:23:28 +02:00
parent e8999332bf
commit 1704d71b22
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -46,7 +46,7 @@ gem 'foreigner', '1.6.1'
# File uploading
gem 'carrierwave', '0.10.0'
gem 'fog', '1.19.0'
gem 'fog', '1.22.1'
gem 'mini_magick', '3.7.0'
gem 'remotipart', '1.2.1'

32
Gemfile.lock
View file

@ -128,7 +128,7 @@ GEM
ethon (0.6.2)
ffi (>= 1.3.0)
mime-types (~> 1.18)
excon (0.31.0)
excon (0.34.0)
execjs (2.1.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
@ -143,23 +143,31 @@ GEM
fixture_builder (0.3.6)
activerecord (>= 2)
activesupport (>= 2)
fog (1.19.0)
fog (1.22.1)
fog-brightbox
fog-core (~> 1.22)
fog-json
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
fog-brightbox (0.0.2)
fog-core
fog-json
fog-core (1.22.0)
builder
excon (~> 0.31.0)
formatador (~> 0.2.0)
excon (~> 0.33)
formatador (~> 0.2)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5)
ruby-hmac
fog-json (1.0.0)
multi_json (~> 1.0)
font-awesome-rails (3.2.1.2)
railties (>= 3.2, < 5.0)
foreigner (1.6.1)
activerecord (>= 3.0.0)
foreman (0.62.0)
thor (>= 0.13.6)
formatador (0.2.4)
formatador (0.2.5)
fssm (0.2.10)
fuubar (1.3.2)
rspec (>= 2.14.0, < 3.1.0)
@ -203,6 +211,7 @@ GEM
actionpack (>= 3.0.0)
i18n-inflector (~> 2.6)
railties (>= 3.0.0)
ipaddress (0.8.0)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
@ -249,9 +258,9 @@ GEM
multipart-post (1.2.0)
mysql2 (0.3.14)
nested_form (0.3.2)
net-scp (1.1.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh (2.9.1)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth (0.4.7)
@ -377,7 +386,6 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby-hmac (0.4.0)
ruby-oembed (0.8.9)
ruby-progressbar (1.4.0)
rubyzip (1.1.0)
@ -480,7 +488,7 @@ DEPENDENCIES
faraday (= 0.8.9)
faraday_middleware (= 0.9.0)
fixture_builder (= 0.3.6)
fog (= 1.19.0)
fog (= 1.22.1)
foreigner (= 1.6.1)
foreman (= 0.62)
fuubar (= 1.3.2)