diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-30 14:25:47 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-30 14:25:47 +0000 |
| commit | 445c2432c7c61af5674627b3f5e5fc88323dac44 (patch) | |
| tree | 9c4df1b34286d42c34d16f90ea11f9b5d00a74b2 | |
| parent | d77a0c7bba3ae163bab8cb9880d6b776cd3354be (diff) | |
| parent | fcadf2aa0924597bfc16b7306e8c36469e912276 (diff) | |
| download | gitlab-ce-445c2432c7c61af5674627b3f5e5fc88323dac44.tar.gz | |
Merge branch '40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fu' into 'master'
Pin seed-fu to 2.3.6 since 2.3.7 is broken and add a fixture file that uses seed-fu in the test env
Closes #40690
See merge request gitlab-org/gitlab-ce!15661
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | db/fixtures/test/01_admin.rb | 15 |
3 files changed, 18 insertions, 3 deletions
@@ -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) 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 |