summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-01 20:53:06 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-01 20:53:06 +0000
commit62730e5431b03feca1d6101acb791ccfe8bed785 (patch)
tree29f56874371bfae83ae428f54a02cb20aea2604f
parentf89a3349c046ba64a37c9e8253263bbb768e65b1 (diff)
parent1586846790045fe294ec558a8f9ee65e94fbe49f (diff)
downloadgitlab-ce-62730e5431b03feca1d6101acb791ccfe8bed785.tar.gz
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
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b2e240feef3..df2f18cfbe5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -647,9 +647,9 @@ GEM
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
- seed-fu (2.3.5)
- activerecord (>= 3.1, < 4.3)
- activesupport (>= 3.1, < 4.3)
+ seed-fu (2.3.6)
+ activerecord (>= 3.1)
+ activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
sentry-raven (1.1.0)