Skip to content
This repository
Browse code

Merge pull request #3424 from justindthomas/update-fog

update-gems [ci skip]
  • Loading branch information...
commit 28ad6accaaf5474368908fc1984adfcfeb0fe427 2 parents 20948d5 + 21f5e32
Maxwell Salzberg maxwell authored

Showing 1 changed file with 10 additions and 7 deletions. Show diff stats Hide diff stats

  1. +10 7 Gemfile.lock
17 Gemfile.lock
@@ -143,7 +143,7 @@ GEM
143 143 diff-lcs (1.1.3)
144 144 erubis (2.7.0)
145 145 eventmachine (0.12.10)
146   - excon (0.14.0)
  146 + excon (0.14.2)
147 147 execjs (1.4.0)
148 148 multi_json (~> 1.0)
149 149 factory_girl (2.6.4)
@@ -160,14 +160,15 @@ GEM
160 160 fixture_builder (0.3.3)
161 161 activerecord (>= 2)
162 162 activesupport (>= 2)
163   - fog (0.7.2)
  163 + fog (1.4.0)
164 164 builder
165   - excon (>= 0.6.1)
166   - formatador (>= 0.1.3)
167   - json
  165 + excon (~> 0.14.0)
  166 + formatador (~> 0.2.0)
168 167 mime-types
  168 + multi_json (~> 1.0)
  169 + net-scp (~> 1.0.4)
169 170 net-ssh (>= 2.1.3)
170   - nokogiri (>= 1.4.4)
  171 + nokogiri (~> 1.5.0)
171 172 ruby-hmac
172 173 foreigner (1.1.6)
173 174 activerecord (>= 3.0.0)
@@ -255,7 +256,7 @@ GEM
255 256 mime-types (~> 1.16)
256 257 treetop (~> 1.4.8)
257 258 messagebus_ruby_api (1.0.3)
258   - mime-types (1.18)
  259 + mime-types (1.19)
259 260 mini_magick (3.4)
260 261 subexec (~> 0.2.1)
261 262 mobile-fu (1.1.0)
@@ -423,6 +424,7 @@ GEM
423 424 hike (~> 1.2)
424 425 rack (~> 1.0)
425 426 tilt (~> 1.1, != 1.3.0)
  427 + sqlite3 (1.3.6)
426 428 subexec (0.2.2)
427 429 thin (1.3.1)
428 430 daemons (>= 1.0.9)
@@ -543,6 +545,7 @@ DEPENDENCIES
543 545 selenium-webdriver (~> 2.22.1)
544 546 settingslogic!
545 547 spork (~> 1.0rc2)
  548 + sqlite3
546 549 thin (~> 1.3.1)
547 550 timecop
548 551 twitter (= 2.0.2)

0 comments on commit 28ad6ac

Please sign in to comment.
Something went wrong with that request. Please try again.