Commit 62730e54 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'upgrade-seedfu' into 'master'

Upgrade seed-fu from 2.3.5 to 2.3.6

Adds Rails 5 support. Working toward #14286.

Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236

See merge request !5042
parents f89a3349 15868467
...@@ -647,9 +647,9 @@ GEM ...@@ -647,9 +647,9 @@ GEM
sdoc (0.3.20) sdoc (0.3.20)
json (>= 1.1.3) json (>= 1.1.3)
rdoc (~> 3.10) rdoc (~> 3.10)
seed-fu (2.3.5) seed-fu (2.3.6)
activerecord (>= 3.1, < 4.3) activerecord (>= 3.1)
activesupport (>= 3.1, < 4.3) activesupport (>= 3.1)
select2-rails (3.5.9.3) select2-rails (3.5.9.3)
thor (~> 0.14) thor (~> 0.14)
sentry-raven (1.1.0) sentry-raven (1.1.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment