diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 12:24:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 12:24:38 +0300 |
| commit | 898e2cc1dfa88b4ac39cb4b35011f61b37f57b51 (patch) | |
| tree | c6524edb6c9a43cccf93be05c36883fde1a53ee4 /db/fixtures | |
| parent | b5571e6e22cdacc81f78eff5943d68c8ba220fbb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/fixtures')
| -rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 77650ebb1bc..9157045a7fd 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -47,7 +47,7 @@ Gitlab::Seeder.quiet do project = Project.find_by_full_path('gitlab-org/gitlab-test') - next if project.empty_repo? # We don't have repository on CI + next if !project || project.empty_repo? # We don't have repository on CI params = { source_branch: 'feature', diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 2532b71ad26..3e017b810b6 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -5,7 +5,7 @@ class Gitlab::Seeder::CycleAnalytics def initialize(project, perf: false) @project = project @user = User.admins.first - @issue_count = perf ? 1000 : 5 + @issue_count = perf ? 1000 : ENV.fetch('CYCLE_ANALYTICS_ISSUE_COUNT', 5).to_i end def seed_metrics! |