summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-12-27 21:04:06 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-03-04 15:26:41 -0500
commit5de46014d74c1805b6bb090f5b2abebd6fb1f399 (patch)
tree3739483b9c166a16e812b0e61ea39164efd73573
parentcb73470b933088721dbfa63840f191307a79a394 (diff)
downloadgitlab-ce-5de46014d74c1805b6bb090f5b2abebd6fb1f399.tar.gz
Bump factory_girl_rails to ~> 4.6.0
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock8
2 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index c646fb1ff7b..dda525415cf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -260,10 +260,10 @@ group :development, :test do
gem 'awesome_print', '~> 1.2.0', require: false
gem 'fuubar', '~> 2.0.0'
- gem 'database_cleaner', '~> 1.4.0'
- gem 'factory_girl_rails', '~> 4.3.0'
- gem 'rspec-rails', '~> 3.3.0'
- gem 'spinach-rails', '~> 0.2.1'
+ gem 'database_cleaner', '~> 1.4.0'
+ gem 'factory_girl_rails', '~> 4.6.0'
+ gem 'rspec-rails', '~> 3.3.0'
+ gem 'spinach-rails', '~> 0.2.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index bdf7dbfd157..246334f0b5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,10 +194,10 @@ GEM
excon (0.45.4)
execjs (2.6.0)
expression_parser (0.9.0)
- factory_girl (4.3.0)
+ factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.3.0)
- factory_girl (~> 4.3.0)
+ factory_girl_rails (4.6.0)
+ factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
@@ -916,7 +916,7 @@ DEPENDENCIES
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)
email_spec (~> 1.6.0)
- factory_girl_rails (~> 4.3.0)
+ factory_girl_rails (~> 4.6.0)
ffaker (~> 2.0.0)
flay
flog