summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-02-19 10:18:21 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-02-19 10:18:26 +0000
commit9fc393c23dfa206802fdce162be1e06dca65ab54 (patch)
tree8f307d9728e615aec811fc3fcd6f9a516b0c1f03 /db
parentb284ce0428d855600899764a1c9bf0a7f3e88277 (diff)
parent5526458b4bd4cbba9216793429036155e7b7ea0c (diff)
downloadgitlab-ce-9fc393c23dfa206802fdce162be1e06dca65ab54.tar.gz
[ci skip] Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke
* master: (114 commits) Fix Error 500 when viewing a commit with a GPG signature in Geo Remember assignee when moving an issue Add changelog entry Allow oxford commas and spaces before commas in MR issue closing pattern. Don't cache a nil repository root ref to prevent caching issues Add back database changes for Ci::Build Revert "Merge branch 'expired-ci-artifacts' into 'master'" Fix order dependencies in some specs migrate admin:users:* to static bundle correct for missing break statement in dispatcher.js alias create and update actions to new and edit migrate projects:merge_requests:edit to static bundle migrate projects:merge_requests:creations:diffs to static bundle migrate projects:merge_requests:creations:new to static bundle migrate projects:issues:new and projects:issues:edit to static bundle migrate projects:branches:index to static bundle migrate projects:branches:new to static bundle migrate projects:compare:show to static bundle migrate projects:environments:metrics to static bundle migrate projects:milestones:* and groups:milestones:* to static bundle ...
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/01_admin.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/db/fixtures/development/01_admin.rb b/db/fixtures/development/01_admin.rb
index 6f241f6fa4a..dfb50c195c1 100644
--- a/db/fixtures/development/01_admin.rb
+++ b/db/fixtures/development/01_admin.rb
@@ -9,7 +9,6 @@ Gitlab::Seeder.quiet do
s.username = 'root'
s.password = '5iveL!fe'
s.admin = true
- s.projects_limit = 100
s.confirmed_at = DateTime.now
end
end