summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-11-28 16:41:56 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-11-28 16:41:56 +0000
commit2081650afc6417daa5933146c0922ff622a958b7 (patch)
treea52ea193194585d3480acd869b89a9006e4cd86a
parent52f5259ae40cfd868c6412ba10e28dc83877afbb (diff)
parent7a7130beddec95e0eebe69de70b90fb292f9648c (diff)
downloadgitlab-ce-2081650afc6417daa5933146c0922ff622a958b7.tar.gz
Merge branch 'rs-fix-gemfile-lock' into 'master'
Lock seed-fu at the correct version in Gemfile.lock See merge request gitlab-org/gitlab-ce!15631
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 16fd440279b..7375fce8b1e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1153,7 +1153,7 @@ DEPENDENCIES
sanitize (~> 2.0)
sass-rails (~> 5.0.6)
scss_lint (~> 0.54.0)
- seed-fu (~> 2.3.5)
+ seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
sentry-raven (~> 2.5.3)