Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'

Upgrade seed-fu to 2.3.7 Closes #40568 See merge request gitlab-org/gitlab-ce!15607

Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'
4d89f520 · Rémy Coutable · 94c5ca71 · c3444c9a · 4d89f520 · 4d89f520
Commit 4d89f520 authored Nov 28, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

40568-bump-seed-fu-to-2-3-7.yml changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml +5 -0

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -111,7 +111,7 @@ gem 'google-api-client', '~> 0.13.6'
 gem 'unf', '~> 0.1.4'
 # Seed data
-gem 'seed-fu', '~> 2.3.5'
+gem 'seed-fu', '~> 2.3.7'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -815,7 +815,7 @@ GEM
      rake (>= 0.9, < 13)
      sass (~> 3.4.20)
    securecompare (1.0.0)
-    seed-fu (2.3.6)
+    seed-fu (2.3.7)
      activerecord (>= 3.1)
      activesupport (>= 3.1)
    select2-rails (3.5.9.3)

--- a/changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml
+++ b/changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml
+---
+title: Upgrade seed-fu to 2.3.7
+merge_request: 15607
+author: Takuya Noguchi
+type: other