From 6c97e8be8fd9e7081c3dfdbe6620b640bc062a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 30 Nov 2017 13:27:46 +0100 Subject: Pin seed-fu to 2.3.6 since 2.3.7 is broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b6580c28eb7..ad4b1e73fff 100644 --- 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.7' +gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7375fce8b1e..3f4c930c71d 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.7) + seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) select2-rails (3.5.9.3) @@ -1153,7 +1153,7 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.54.0) - seed-fu (~> 2.3.7) + seed-fu (= 2.3.6) select2-rails (~> 3.5.9) selenium-webdriver (~> 3.5) sentry-raven (~> 2.5.3) -- cgit v1.2.1 From fcadf2aa0924597bfc16b7306e8c36469e912276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 30 Nov 2017 13:28:18 +0100 Subject: Add a fixture file that uses seed-fu in the test env so that a borken seed-fu is detected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- db/fixtures/test/01_admin.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 db/fixtures/test/01_admin.rb diff --git a/db/fixtures/test/01_admin.rb b/db/fixtures/test/01_admin.rb new file mode 100644 index 00000000000..6f241f6fa4a --- /dev/null +++ b/db/fixtures/test/01_admin.rb @@ -0,0 +1,15 @@ +require './spec/support/sidekiq' + +Gitlab::Seeder.quiet do + User.seed do |s| + s.id = 1 + s.name = 'Administrator' + s.email = 'admin@example.com' + s.notification_email = 'admin@example.com' + s.username = 'root' + s.password = '5iveL!fe' + s.admin = true + s.projects_limit = 100 + s.confirmed_at = DateTime.now + end +end -- cgit v1.2.1