From 8c8f6e5b5d28e92711c1d977b6f2c132b16348b2 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Fri, 30 Sep 2011 14:49:19 +0800
Subject: [PATCH] Pegged factory_girl and factory_girl_rails. Updated Gemfile.lock

---
 Gemfile      |   5 +++--
 Gemfile.lock |  99 +++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77f0df9..c4b8ac1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,13 +20,14 @@ gem 'hoptoad_notifier', "~> 2.4"
 gem 'actionmailer_inline_css', "~> 1.3.0"
 
 platform :ruby do
-  gem 'bson_ext', '~> 1.3.1'
+  gem 'bson_ext', '~> 1.4.0'
 end
 
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
-  gem 'factory_girl_rails'
+  gem 'factory_girl', '~> 1.3.3'
+  gem 'factory_girl_rails', '~> 1.0.1'
   unless ENV['TRAVIS']
     gem 'ruby-debug', :platform => :mri_18
     gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
diff --git a/Gemfile.lock b/Gemfile.lock
index e1fb379..aa89b4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionmailer_inline_css (1.3.0)
+    actionmailer_inline_css (1.3.1)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
@@ -33,25 +33,26 @@ GEM
       activemodel (= 3.0.10)
       activesupport (= 3.0.10)
     activesupport (3.0.10)
-    addressable (2.2.5)
+    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bcrypt-ruby (2.1.4)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bcrypt-ruby (3.0.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     columnize (0.3.4)
-    crack (0.1.8)
+    crack (0.3.1)
     css_parser (1.2.5)
       addressable
     daemons (1.1.4)
     database_cleaner (0.6.7)
-    devise (1.4.2)
-      bcrypt-ruby (~> 2.1.2)
+    devise (1.4.7)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.3)
-    email_spec (1.1.1)
+    email_spec (1.2.1)
+      mail (~> 2.2)
       rspec (~> 2.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -60,15 +61,15 @@ GEM
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
       railties (>= 3.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    faraday_middleware (0.6.5)
-      faraday (~> 0.6.0)
-    haml (3.0.25)
-    happymapper (0.3.2)
-      libxml-ruby (~> 1.1.3)
+      rack (< 2, >= 1.1.0)
+    faraday_middleware (0.7.0)
+      faraday (~> 0.7.3)
+    haml (3.1.3)
+    happymapper (0.4.0)
+      libxml-ruby (~> 2.0)
     has_scope (0.5.1)
     hashie (1.0.0)
     hoptoad_notifier (2.4.11)
@@ -76,10 +77,10 @@ GEM
       builder
     htmlentities (4.3.0)
     i18n (0.5.0)
-    inherited_resources (1.2.2)
+    inherited_resources (1.3.0)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    libxml-ruby (1.1.4)
+    libxml-ruby (2.2.2)
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -93,40 +94,43 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongoid (2.1.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    mongoid_rails_migrations (0.0.10)
-      activesupport (~> 3.0.0)
-      bundler (>= 0.9.19)
-      rails (~> 3.0.0)
-      railties (~> 3.0.0)
+    mongoid_rails_migrations (0.0.14)
+      activesupport (>= 3.0.0)
+      bundler (>= 1.0.0)
+      rails (>= 3.0.0)
+      railties (>= 3.0.0)
     multi_json (1.0.3)
     multipart-post (1.1.3)
-    nokogiri (1.4.4)
-    octokit (0.6.3)
-      addressable (~> 2.2.4)
-      faraday (~> 0.6.0)
-      faraday_middleware (~> 0.6.0)
+    nokogiri (1.5.0)
+    octokit (0.6.4)
+      addressable (~> 2.2.6)
+      faraday (~> 0.7.3)
+      faraday_middleware (~> 0.7.0.rc1)
       hashie (~> 1.0.0)
-      multi_json (~> 1.0.0)
-      rash (~> 0.3.0)
+      multi_json (~> 1.0.2)
     orm_adapter (0.0.5)
     oruen_redmine_client (0.0.1)
       activeresource (>= 2.3.0)
-    pivotal-tracker (0.2.0)
+    pivotal-tracker (0.4.1)
       builder
-      happymapper (>= 0.2.4)
-      nokogiri (~> 1.4.1)
-      rest-client (~> 1.5.1)
+      builder
+      happymapper (>= 0.3.2)
+      happymapper (>= 0.3.2)
+      nokogiri (>= 1.4.3)
+      nokogiri (~> 1.4)
+      rest-client (~> 1.6.0)
+      rest-client (~> 1.6.0)
     polyglot (0.3.2)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
-    rack (1.2.3)
+    rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -146,12 +150,10 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rash (0.3.0)
-      hashie (~> 1.0.0)
     rbx-require-relative (0.0.5)
     rdoc (3.9.4)
     responders (0.6.4)
-    rest-client (1.5.1)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -195,14 +197,14 @@ GEM
     typhoeus (0.2.4)
       mime-types
       mime-types
-    tzinfo (0.3.29)
-    useragent (0.3.1)
+    tzinfo (0.3.30)
+    useragent (0.3.2)
     warden (1.0.5)
       rack (>= 1.0)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
+    webmock (1.7.6)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
-    will_paginate (3.0.0)
+    will_paginate (3.0.2)
 
 PLATFORMS
   ruby
@@ -210,11 +212,12 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer
   actionmailer_inline_css (~> 1.3.0)
-  bson_ext (~> 1.3.1)
+  bson_ext (~> 1.4.0)
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
   email_spec
-  factory_girl_rails
+  factory_girl (~> 1.3.3)
+  factory_girl_rails (~> 1.0.1)
   haml
   hoptoad_notifier (~> 2.4)
   htmlentities (~> 4.3.0)
--
libgit2 0.21.2