diff --git a/Gemfile b/Gemfile index 01fc961..b08ba29 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'carrierwave' # SQLite: gem 'sqlite3-ruby' # MySQL: -#gem 'mysql2', '~> 0.2.7' # Use version 0.3 and up for Rails 3.1 +#gem 'mysql2' # PostgreSQL: #gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 2abfbc7..73be337 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,22 +30,22 @@ GEM activesupport (3.1.3) multi_json (~> 1.0) arel (2.2.1) - authlogic (3.0.3) + authlogic (3.1.0) activerecord (>= 3.0.7) activerecord (>= 3.0.7) builder (3.0.0) - carrierwave (0.5.7) + carrierwave (0.5.8) activesupport (~> 3.0) erubis (2.7.0) - excon (0.6.6) - fog (0.11.0) + excon (0.9.4) + fog (1.1.2) builder - excon (~> 0.6.5) + excon (~> 0.9.0) formatador (~> 0.2.0) mime-types multi_json (~> 1.0.3) net-scp (~> 1.0.4) - net-ssh (~> 2.1.4) + net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.1) @@ -58,12 +58,12 @@ GEM treetop (~> 1.4.8) mime-types (1.17.2) mini_exiftool (1.3.1) - mini_magick (3.3) - subexec (~> 0.1.0) - multi_json (1.0.3) + mini_magick (3.4) + subexec (~> 0.2.1) + multi_json (1.0.4) net-scp (1.0.4) net-ssh (>= 1.99.1) - net-ssh (2.1.4) + net-ssh (2.2.2) nokogiri (1.5.0) polyglot (0.3.3) rack (1.3.6) @@ -98,10 +98,10 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.4) + sqlite3 (1.3.5) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - subexec (0.1.0) + subexec (0.2.1) thor (0.14.6) tilt (1.3.3) treetop (1.4.10)