diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-28 09:22:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-28 09:22:53 +0000 |
| commit | 4d89f5207cc8c2235e0e6ac9afa25b0b5689a3cf (patch) | |
| tree | 631e5bf8fece6bf3de7424582063ac7d45fe0da3 | |
| parent | 94c5ca71b7d1c0a47f42eea21deaedcbb3979ea7 (diff) | |
| parent | c3444c9a2078c350d8da6e2d377ad18ba32287a1 (diff) | |
| download | gitlab-ce-4d89f5207cc8c2235e0e6ac9afa25b0b5689a3cf.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml | 5 |
3 files changed, 7 insertions, 2 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index cfad693f933..16fd440279b 100644 --- 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) diff --git a/changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml b/changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml new file mode 100644 index 00000000000..708269d5c83 --- /dev/null +++ b/changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade seed-fu to 2.3.7 +merge_request: 15607 +author: Takuya Noguchi +type: other |