Merge pull request #2534 from marutosi/finn/release/4.0/factory_girl_rails

update factory_girl_rails version

Gemfile

@@ -128,7 +128,7 @@ group :test do
   gem 'shoulda'
   gem 'object-daddy', '~> 1.1.0'
   gem "launchy", "~> 2.3.0"
-  gem "factory_girl_rails", "~> 4.0"
+  gem "factory_girl_rails", "~> 4.5"
   gem 'cucumber-rails', "~> 1.4.2", :require => false
   gem 'rack_session_access'
   # restrict because in version 1.3 a lot of tests using acts as journalized

Gemfile.lock

@@ -170,10 +170,10 @@ GEM
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     faker (1.2.0)
       i18n (~> 0.5)
@@ -431,7 +431,7 @@ DEPENDENCIES
   database_cleaner (~> 1.2.0)
   date_validator (~> 0.7.1)
   delayed_job_active_record (= 0.3.3)
-  factory_girl_rails (~> 4.0)
+  factory_girl_rails (~> 4.5)
   faker
   globalize (~> 3.1.0)
   gon (~> 4.0)