Merge branch 'rs-gems' into 'master'

Update ffaker gem

Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.

Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR.

Also updates `spring` version and the binstubs, just for kicks.

See merge request !686

7 files changed, 14 insertions, 14 deletions

diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index ae4c0550a4f..87839770924 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -23,7 +23,7 @@ Sidekiq::Testing.inline! do
           name: group_path.titleize,
           path: group_path
         )
-        group.description = Faker::Lorem.sentence
+        group.description = FFaker::Lorem.sentence
         group.save
 
         group.add_owner(User.first)
@@ -35,7 +35,7 @@ Sidekiq::Testing.inline! do
         import_url: url,
         namespace_id: group.id,
         name: project_path.titleize,
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         visibility_level: Gitlab::VisibilityLevel.values.sample
       }
 
diff --git a/db/fixtures/development/05_users.rb b/db/fixtures/development/05_users.rb
index 24952a1f661..378354efd5a 100644
--- a/db/fixtures/development/05_users.rb
+++ b/db/fixtures/development/05_users.rb
@@ -2,9 +2,9 @@ Gitlab::Seeder.quiet do
   (2..20).each  do |i|
     begin
       User.create!(
-        username: Faker::Internet.user_name,
-        name: Faker::Name.name,
-        email: Faker::Internet.email,
+        username: FFaker::Internet.user_name,
+        name: FFaker::Name.name,
+        email: FFaker::Internet.email,
         confirmed_at: DateTime.now,
         password: '12345678'
       )
diff --git a/db/fixtures/development/07_milestones.rb b/db/fixtures/development/07_milestones.rb
index 2296821e528..a43116829d9 100644
--- a/db/fixtures/development/07_milestones.rb
+++ b/db/fixtures/development/07_milestones.rb
@@ -3,7 +3,7 @@ Gitlab::Seeder.quiet do
     (1..5).each  do |i|
       milestone_params = {
         title: "v#{i}.0",
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
       }
 
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb
index e8b01b46d22..c636e96381c 100644
--- a/db/fixtures/development/09_issues.rb
+++ b/db/fixtures/development/09_issues.rb
@@ -2,8 +2,8 @@ Gitlab::Seeder.quiet do
   Project.all.each do |project|
     (1..10).each  do |i|
       issue_params = {
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentence,
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
         milestone: project.milestones.sample,
         assignee: project.team.users.sample
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index f9b2fd8b05f..0825776ffaa 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -10,8 +10,8 @@ Gitlab::Seeder.quiet do
       params = {
         source_branch: source_branch,
         target_branch: target_branch,
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentences(3).join(" "),
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentences(3).join(" "),
         milestone: project.milestones.sample,
         assignee: project.team.users.sample
       }
diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index b3a6f39c7d5..3bd4b442ade 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -28,8 +28,8 @@ eos
     PersonalSnippet.seed(:id, [{
       id: i,
       author_id: user.id,
-      title: Faker::Lorem.sentence(3),
-      file_name:  Faker::Internet.domain_word + '.rb',
+      title: FFaker::Lorem.sentence(3),
+      file_name:  FFaker::Internet.domain_word + '.rb',
       visibility_level: Gitlab::VisibilityLevel.values.sample,
       content: content,
     }])
diff --git a/db/fixtures/development/13_comments.rb b/db/fixtures/development/13_comments.rb
index d37be53c7b9..566c0705638 100644
--- a/db/fixtures/development/13_comments.rb
+++ b/db/fixtures/development/13_comments.rb
@@ -6,7 +6,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'Issue',
         noteable_id: issue.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute
@@ -21,7 +21,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'MergeRequest',
         noteable_id: mr.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute