From 735a1dbc0ae95675e18ea665817afd24b11a9c2a Mon Sep 17 00:00:00 2001 From: Vitor Baptista Date: Mon, 6 Aug 2012 22:27:59 -0300 Subject: [PATCH] Upgrading bundler, formtastic and paperclip. --- Gemfile | 9 ++++----- Gemfile.lock | 13 +++++++------ vendor/cache/formtastic-0.2.5.gem | Bin 0 -> 45056 bytes vendor/cache/justinfrench-formtastic-0.2.2.gem | Bin 40448 -> 0 bytes vendor/cache/nokogiri-1.5.0.gem | Bin 187904 -> 0 bytes vendor/cache/nokogiri-1.5.5.gem | Bin 0 -> 209920 bytes vendor/cache/paperclip-2.3.1.gem | Bin 0 -> 72192 bytes vendor/cache/thoughtbot-paperclip-2.3.1.gem | Bin 72192 -> 0 bytes 8 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 vendor/cache/formtastic-0.2.5.gem delete mode 100644 vendor/cache/justinfrench-formtastic-0.2.2.gem delete mode 100644 vendor/cache/nokogiri-1.5.0.gem create mode 100644 vendor/cache/nokogiri-1.5.5.gem create mode 100644 vendor/cache/paperclip-2.3.1.gem delete mode 100644 vendor/cache/thoughtbot-paperclip-2.3.1.gem diff --git a/Gemfile b/Gemfile index 2bda43d..c6ce442 100644 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,19 @@ source :rubygems source "http://gems.github.com" -gem "bundler", "1.0.21" +gem "rake", "~> 0.9.2.2" +gem "bundler", "~> 1.1.5" gem "rails", "2.3.14" gem "hoptoad_notifier", "2.4.9" gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls" -gem "thoughtbot-paperclip", "2.3.1", - :require => "paperclip" +gem "paperclip", "2.3.1" gem "mime-types", "1.16", :require => "mime/types" gem "xml-simple", "1.0.12", :require => "xmlsimple" gem "yfactorial-utility_scopes", "0.2.2", :require => "utility_scopes" -gem "justinfrench-formtastic", "0.2.2", - :require => "formtastic" +gem "formtastic", "~> 0.2.2" gem "inherited_resources", "1.0.4" gem "has_scope", "0.4.2" gem "responders", "0.4.8" diff --git a/Gemfile.lock b/Gemfile.lock index 01c4df1..54ee0a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,7 @@ GEM factory_girl (1.2.3) fakeweb (1.2.5) fastercsv (1.5.1) + formtastic (0.2.5) gherkin (2.1.5) trollop (~> 1.16.2) has_scope (0.4.2) @@ -40,11 +41,11 @@ GEM rake json_pure (1.4.6) jtrupiano-timecop (0.2.1) - justinfrench-formtastic (0.2.2) mime-types (1.16) mysql2 (0.2.18) newrelic_rpm (3.3.0) - nokogiri (1.5.0) + nokogiri (1.5.5) + paperclip (2.3.1) rack (1.1.3) rails (2.3.14) actionmailer (= 2.3.14) @@ -67,7 +68,6 @@ GEM shoulda (2.10.3) term-ansicolor (1.0.7) thoughtbot-clearance (0.8.2) - thoughtbot-paperclip (2.3.1) trollop (1.16.2) webrat (0.5.3) nokogiri (>= 1.2.0) @@ -81,23 +81,25 @@ PLATFORMS DEPENDENCIES ambethia-smtp-tls (= 1.1.2) - bundler (= 1.0.21) + bundler (~> 1.1.5) cucumber (= 0.8.5) delayed_job (= 2.0.6) factory_girl (= 1.2.3) fakeweb (= 1.2.5) fastercsv (= 1.5.1) + formtastic (~> 0.2.2) has_scope (= 0.4.2) hoptoad_notifier (= 2.4.9) inherited_resources (= 1.0.4) jferris-mocha (= 0.9.5.0.1241126838) json_pure (= 1.4.6) jtrupiano-timecop (= 0.2.1) - justinfrench-formtastic (= 0.2.2) mime-types (= 1.16) mysql2 (= 0.2.18) newrelic_rpm (= 3.3.0) + paperclip (= 2.3.1) rails (= 2.3.14) + rake (~> 0.9.2.2) redis (= 1.0.7) responders (= 0.4.8) rspec (~> 1.3.1) @@ -106,7 +108,6 @@ DEPENDENCIES sendgrid (= 0.1.4) shoulda (~> 2.10.1) thoughtbot-clearance (= 0.8.2) - thoughtbot-paperclip (= 2.3.1) webrat (= 0.5.3) xml-simple (= 1.0.12) yfactorial-utility_scopes (= 0.2.2) diff --git a/vendor/cache/formtastic-0.2.5.gem b/vendor/cache/formtastic-0.2.5.gem new file mode 100644 index 0000000..4199fb7 Binary files /dev/null and b/vendor/cache/formtastic-0.2.5.gem differ diff --git a/vendor/cache/justinfrench-formtastic-0.2.2.gem b/vendor/cache/justinfrench-formtastic-0.2.2.gem deleted file mode 100644 index 22299ac..0000000 Binary files a/vendor/cache/justinfrench-formtastic-0.2.2.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.5.0.gem b/vendor/cache/nokogiri-1.5.0.gem deleted file mode 100644 index 47c37a6..0000000 Binary files a/vendor/cache/nokogiri-1.5.0.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.5.5.gem b/vendor/cache/nokogiri-1.5.5.gem new file mode 100644 index 0000000..9f556d5 Binary files /dev/null and b/vendor/cache/nokogiri-1.5.5.gem differ diff --git a/vendor/cache/paperclip-2.3.1.gem b/vendor/cache/paperclip-2.3.1.gem new file mode 100644 index 0000000..93b068f Binary files /dev/null and b/vendor/cache/paperclip-2.3.1.gem differ diff --git a/vendor/cache/thoughtbot-paperclip-2.3.1.gem b/vendor/cache/thoughtbot-paperclip-2.3.1.gem deleted file mode 100644 index b99a7bf..0000000 Binary files a/vendor/cache/thoughtbot-paperclip-2.3.1.gem and /dev/null differ -- libgit2 0.21.2